Pārlūkot izejas kodu

1.修改后线人员登录无法查看闪电增员

y 2 gadi atpakaļ
vecāks
revīzija
fa3849c243

+ 1 - 0
src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -454,6 +454,7 @@ public class SysUserController extends BaseController {
         if (StringUtils.isNotEmpty(sysUser.getDeptId())) {
             SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
             sysUser.setDeptName(sysDept.getName());
+            sysUser.setIsHasAddUser(sysDept.getManagementSource()!=null?1:0);
         }
 
         EsmUserReferrer eur = esmUserReferrerService.getById(sysUser.getId());

+ 2 - 3
src/main/java/com/ydtech/modules/admin/controller/SysUserRecruitingController.java

@@ -23,9 +23,8 @@ public class SysUserRecruitingController {
     @GetMapping("/queryType")
     @ApiOperation("机构来源查询")
     public HttpResult<Object> queryType(){
-        SysUser user = new BaseController().getUser();
-        String deptId = user.getDeptId();
-        return sysUserRecruitingService.queryType(deptId);
+        BaseController baseController = new BaseController();
+        return sysUserRecruitingService.queryType(baseController.getDeptId());
     }
 
 }

+ 6 - 0
src/main/java/com/ydtech/modules/admin/model/SysUser.java

@@ -10,6 +10,7 @@ import com.ydtech.exception.SystemException;
 import com.ydtech.modules.base.model.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -108,6 +109,11 @@ public class SysUser extends BaseEntity {
 
     //------------------
 
+
+    @ApiModelProperty(value = "是否有闪电增员权限")
+    @TableField(exist = false)
+    private Integer isHasAddUser;
+
     /**
      * 角色ID
      */

+ 1 - 4
src/main/java/com/ydtech/modules/admin/service/impl/SysUserRecruitingServiceImpl.java

@@ -20,10 +20,7 @@ public class SysUserRecruitingServiceImpl implements SysUserRecruitingService {
     @Override
     public HttpResult<Object> queryType(String deptId) {
         SysDept sysDept = sysDeptService.getById(deptId);
-        // 查询上级机构个代还是出单员
-        String parentId = sysDept.getParentId();
-        SysDept sysDeptParent = sysDeptService.getById(parentId);
-        String managementSource = sysDeptParent.getManagementSource();
+        String managementSource = sysDept.getManagementSource();
         AssertionUtils.isFail(StringUtils.isEmpty(managementSource), "此机构暂时不支持增员");
         OrganizationSource.Source source = Enum.valueOf(OrganizationSource.Source.class, OrganizationSource.Source.NAME + managementSource);
         return HttpResult.ok(source.getDesc(), source.getCode());