基础操作,数据补全

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

@@ -61,7 +61,7 @@ public interface ISysOrganizeService {
      * @return
      */
     @ApiOperation(value = "查询组织信息",notes = "查询所有组织信息")
-    List<SysOrganize> listSysOrganize();
+    List<SysOrganize> findSysOrganizeList();
 
     /**
      * 复杂查询

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

@@ -75,6 +75,7 @@ public class SysDepartmentController extends CoreBaseController {
 
             //新增初始化
             ConvertBean.modelInitialize(department, user);
+            department.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
             if(department.getParentId() == null || department.getParentId() <= 0){
                 department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
                 department.setParentNameRdd("顶级部门");

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

@@ -24,13 +24,10 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @Description : 组织对外接口
@@ -146,8 +143,14 @@ public class SysOrganizeController extends CoreBaseController{
     @ApiOperation(value = "查询所有组织", notes = "查询所有组织")
     public ResultBean findSysOrganizeAll() {
         try {
-            List<SysRefUserDepartment> refList = personnelService.findSysRefUserDepartmentByUserId(getSessionUser().getUser().getId());
+            List<SysOrganize> result;
-            List<SysOrganize> result = organizeService.findOrganizeIdByRefUsers(refList);
+            if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){
+                result = organizeService.findSysOrganizeList();
+            }else {
+                List<SysRefUserDepartment> refList = personnelService.findSysRefUserDepartmentByUserId(getSessionUser().getUser().getId());
+                result = organizeService.findOrganizeIdByRefUsers(refList);
+            }
+
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result);
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);

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

@@ -71,6 +71,7 @@ public class SysPositionController extends CoreBaseController {
                     .notNull("positionCode", position.getPositionCode());
 
             ConvertBean.modelInitialize(position, user);
+            position.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
             if (position.getParentId() == null || position.getParentId() <= 0) {
                 position.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
                 position.setParentNameRdd("顶级岗位");

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

@@ -942,11 +942,14 @@ public class PersonnelServiceService implements IPersonnelService {
                     for (SysDepartment department : departmentList) {
                         ref = new SysRefUserDepartment();
                         ref.setOrganizeId(department.getOrganizeId());
+                        ref.setOrganizeCode(department.getOrganizeCode());
                         ref.setOrganizeNameRdd(department.getOrganizeNameRdd());
                         ref.setDepartmentId(department.getId());
                         ref.setDepartmentNameRdd(department.getName());
                         ref.setUserId(user.getId());
                         ref.setUserNameRdd(user.getUserName());
+                        ref.setIsDeleted(CommonEnumUtil.IS_DEAL.NO.getValue());
+                        ref.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
                         list.add(ref);
 
                         nameList.add(department.getName());
@@ -1005,6 +1008,7 @@ public class PersonnelServiceService implements IPersonnelService {
                     refUserRole.setUserNameRdd(user.getUserName());
                     refUserRole.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
                     refUserRole.setIsDeleted(CommonEnumUtil.IS_DEAL.NO.getValue());
+                    refUserRole.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
                     refUserRoles.add(refUserRole);
                 }
                 refUserRoleRDao.saveAll(refUserRoles);
@@ -1116,10 +1120,14 @@ public class PersonnelServiceService implements IPersonnelService {
                         ref = new SysRefUserInfoDepartment();
                         ref.setOrganizeId(department.getOrganizeId());
                         ref.setOrganizeNameRdd(department.getOrganizeNameRdd());
+                        ref.setOrganizeCode(department.getOrganizeCode());
                         ref.setDepartmentId(department.getId());
                         ref.setDepartmentNameRdd(department.getName());
                         ref.setUserId(info.getId());
                         ref.setUserNameRdd(info.getName());
+                        ref.setIsDeleted(CommonEnumUtil.IS_DEAL.NO.getValue());
+                        ref.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
+
                         list.add(ref);
 
                         nameList.add(department.getName());
@@ -1224,6 +1232,9 @@ public class PersonnelServiceService implements IPersonnelService {
                         ref.setUserNameRdd(userInfo.getName());
                         ref.setPositionId(position.getId());
                         ref.setPositionNameRdd(position.getName());
+                        ref.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
+                        ref.setIsDeleted(CommonEnumUtil.IS_DEAL.NO.getValue());
+                        ref.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
                         list.add(ref);
 
                         nameList.add(position.getName());

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

@@ -164,7 +164,7 @@ public class SysOrganizeService implements ISysOrganizeService {
 
     @Override
     @ApiOperation(value = "查询组织信息", notes = "查询所有组织信息")
-    public List<SysOrganize> listSysOrganize() {
+    public List<SysOrganize> findSysOrganizeList() {
         LOGGER.info("组织 ORGANIZE find All");
         return organizeRDao.findAll();
     }