Merge pull request 'UAT Sweb创建账号优化 #15180' (#13) from castle.zang/i3plus-core:test into test

Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-core/pulls/13

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java

@@ -100,4 +100,14 @@ public interface ISysDepartmentService extends ICrudService<SysDepartment> {
     @ApiOperation(value = "检查工厂是否存在")
     boolean checkSysDepartmentOnly(SysDepartment sysDepartment);
 
+    /**
+     * 根据部门代码和组织代码获取部门信息
+     * @param departmentCode
+     * @param organizeId
+     * @return
+     */
+    @ApiOperation(value = "根据部门代码和组织代码获取部门信息")
+    SysDepartment findSysDepartmentByDepartCodeAndOrganizedId(String departmentCode,Long organizeId);
+
+
 }

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java

@@ -95,5 +95,13 @@ public interface ISysPositionService extends ICrudService<SysPosition> {
 //    @ApiOperation(value = "查询岗位信息",notes = "查询岗位信息 (分页，组合)")
 //    ListPager findSysPositionByPager(SysPosition position, Pager pager);
 
+    /**
+     * 根据组织代码和岗位代码获取岗位信息
+     * @param positionCode
+     * @param organizeCode
+     * @return
+     */
+    @ApiOperation(value = "查询岗位信息", notes = "根据组织代码和岗位代码获取岗位信息")
+    SysPosition findPositionByPositionCodeAndOrganizeId(String positionCode,String  organizeCode);
 
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java

@@ -689,10 +689,11 @@ public class PersonnelController extends CoreBaseController {
                 .notNull("infoPositionId", model.getInfoPositionId())
                 .notNull("infoDepartmentId", model.getInfoDepartmentId())
                 .notNull("userDepartmentId", model.getUserDepartmentId())
-                .notNull("userLoginName", model.getUserLoginName())
+                .notNull("userLoginName", model.getUserLoginName());
                 // FIXME 松下移除邮箱校验
 //                .notNull("userEmail", model.getUserEmail())
-                .notNull("userPhone", model.getUserPhone());
+                // FIXME 松下移除手机号校验
+//               .notNull("userPhone", model.getUserPhone());
     }
 
     /**

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java

@@ -9,9 +9,7 @@ import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
-import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
-import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment;
+import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.impp.framework.base.controller.CrudBaseController;
 import cn.estsh.impp.framework.base.service.ICrudService;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
@@ -24,9 +22,7 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -334,4 +330,32 @@ public class SysDepartmentController extends CrudBaseController<SysDepartment> {
 //        }
 //    }
 
+    @GetMapping(value = "/cloud-query-department/{departmentCode}")
+    @ApiOperation(value = "微服务查询部门", notes = "等值查询部门code")
+    public ResultBean queryPagerByCloud(@PathVariable String departmentCode) {
+        SessionUser sessionUser = getSessionUser();
+        SysUser sysUser = personnelService.getSysUserById(sessionUser.getUserId());
+        Long organizeId = sysUser.getOrganizeId();
+        try {
+            //根据用户组织id 和 部门代码 查询部门
+            SysDepartment sysDepartment = departmentService.findSysDepartmentByDepartCodeAndOrganizedId(departmentCode, organizeId);
+            return ResultBean.success("操作成功").setResultObject(sysDepartment).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+
+    }
+
+    @PostMapping(value = "/cloud-insert")
+    @ApiOperation(value = "微服务添加部门", notes = "添加部门")
+    @Override
+    public ResultBean insertByCloud(@RequestBody SysDepartment bean) {
+        SessionUser sessionUser = getSessionUser();
+        SysUser sysUser = personnelService.getSysUserById(sessionUser.getUserId());
+        Long organizeId = sysUser.getOrganizeId();
+        bean.setOrganizeId(organizeId);
+        return this.insert(bean);
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java

@@ -20,9 +20,7 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -123,4 +121,26 @@ public class SysPositionController extends CrudBaseController<SysPosition> {
             return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
+
+
+    @ApiOperation(value = "微服务查询岗位", notes = "微服务根据岗位代码等值查询岗位")
+    @GetMapping("/cloud-query/{positionCode}")
+    public ResultBean findPositionByCode(@PathVariable String positionCode) {
+        String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
+        try {
+            SysPosition sysPosition = positionService.findPositionByPositionCodeAndOrganizeId(positionCode, organizeCode);
+            return ResultBean.success("操作成功").setResultObject(sysPosition).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
+    @Override
+    @ApiOperation(value = "微服务添加新的职位", notes = "微服务添加新职位")
+    @PostMapping("/cloud-insert")
+    public ResultBean insertByCloud(@RequestBody SysPosition bean) {
+        return this.insert(bean);
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java

@@ -650,14 +650,15 @@ public class PersonnelServiceService implements IPersonnelService {
 //            }
 
             // 手机号唯一教研
-            if(!checkSysUserPhone(user.getUserPhone(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){
-                throw ImppExceptionBuilder.newInstance()
-                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
-                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
-                        .setErrorDetail("手机号已存在")
-                        .setErrorSolution("请重新输入手机号")
-                        .build();
-            }
+            //FIXME 松下移除唯一校验
+//            if(!checkSysUserPhone(user.getUserPhone(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){
+//                throw ImppExceptionBuilder.newInstance()
+//                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+//                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+//                        .setErrorDetail("手机号已存在")
+//                        .setErrorSolution("请重新输入手机号")
+//                        .build();
+//            }
 
             // 工号唯一教研
             if(!checkSysUserEmpNo(user.getUserEmpNo(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java

@@ -319,5 +319,12 @@ public class SysDepartmentService extends CrudService<SysDepartment> implements
         return !departmentRDao.isExitByHql(CoreHqlPack.packHqlCheckSysDepartmentOnly(sysDepartment));
     }
 
+    @Override
+    public SysDepartment findSysDepartmentByDepartCodeAndOrganizedId(String departmentCode,Long organizeId) {
+        String[] columns = {"departmentCode","organizeId"};
+        Object[] values ={departmentCode,organizeId};
+        return departmentRDao.getByProperty(columns,values);
+    }
+
 
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java

@@ -114,4 +114,11 @@ public class SysPositionService extends CrudService<SysPosition> implements ISys
         return new ListPager(positionRDao.findByHqlWherePage(ddlPackBean, pager), pager);
     }
 
+    @Override
+    public SysPosition findPositionByPositionCodeAndOrganizeId(String positionCode, String  organizeCode) {
+        String[] columns = {"positionCode","organizeCode"};
+        Object[] values  = {positionCode,organizeCode};
+        return positionRDao.getByProperty(columns,values);
+    }
+
 }