调整

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/ReimbursementInfoMapper.java

@@ -23,16 +23,21 @@ public interface ReimbursementInfoMapper extends BaseMapper<ReimbursementInfo> {
     List<WorkAttachmentInfo> findFiles(@Param("id") String id);
 
     void updateStatusById(@Param("id") String id, @Param("type") String type);
-    @InterceptorIgnore(tenantLine = "true")
+
     List<TreeUserDto> findOfficeList();
 
+    @InterceptorIgnore(tenantLine = "true")
+    List<TreeUserDto> findOfficeList2();
+
     /**
      * 根据公司id查询公司下所有部门信息
      * @param companyId
      * @return
      */
-    @InterceptorIgnore(tenantLine = "true")
+
     List<TreeUserDto> findOfficeListByCompanyId(@Param("companyId")String companyId);
+    @InterceptorIgnore(tenantLine = "true")
+    List<TreeUserDto> findOfficeListByCompanyId2(@Param("companyId")String companyId);
 
     List<TreeUserDto> findUserList(@Param("name") String name);
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/xml/ReimbursementInfoMapper.xml

@@ -118,10 +118,18 @@
 		SELECT id,`name`,parent_id FROM sys_office WHERE del_flag = 0
 	</select>
 
+	<select id="findOfficeList2" resultType="com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.TreeUserDto">
+		SELECT id,`name`,parent_id FROM sys_office WHERE del_flag = 0
+	</select>
+
 	<select id="findOfficeListByCompanyId" resultType="com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.TreeUserDto">
 		SELECT id,`name`,parent_id FROM sys_office WHERE del_flag = 0 and (id = #{companyId} or parent_ids like concat ('%',#{companyId},'%'))
 	</select>
 
+	<select id="findOfficeListByCompanyId2" resultType="com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.TreeUserDto">
+		SELECT id,`name`,parent_id FROM sys_office WHERE del_flag = 0 and (id = #{companyId} or parent_ids like concat ('%',#{companyId},'%'))
+	</select>
+
 	<select id="findUserList" resultType="com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.TreeUserDto">
 		SELECT
 			a.id,

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -667,8 +667,8 @@ public class ReimbursementInfoService {
         List<TreeUserDto> filterList = new ArrayList<>();
         filterList.addAll(officeList);
         //查询综合管理公司
-        UserDTO dtoByName = SpringUtil.getBean(IUserApi.class).getByLoginName("潘中","10002");
-        List<TreeUserDto> officeList1 = infoMapper.findOfficeListByCompanyId(dtoByName.getCompanyDTO().getId());
+        UserDTO dtoByName = SpringUtil.getBean(IUserApi.class).getByLoginNameNoTen("潘中");
+        List<TreeUserDto> officeList1 = infoMapper.findOfficeListByCompanyId2(dtoByName.getCompanyDTO().getId());
         filterList.addAll(officeList1);
         ArrayList<TreeUserDto> treeUsers = new ArrayList<>();
         //如果当前登录人角色是多公司报销则查询全部公司
@@ -676,7 +676,7 @@ public class ReimbursementInfoService {
             for (RoleDTO roleDTO : userDTO.getRoleDTOList()) {
                 RoleDTO roleDTOById = SpringUtil.getBean(IRoleApi.class).getRoleDTOById(roleDTO.getId());
                 if (roleDTOById.getEnName().equals("dgsbx")){
-                    List<TreeUserDto> officeList2 = infoMapper.findOfficeList();
+                    List<TreeUserDto> officeList2 = infoMapper.findOfficeList2();
                     filterList.addAll(officeList2);
                     List<TreeUserDto> users=infoMapper.finduserAllList(name);
                     treeUsers.addAll(users);

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -1021,7 +1021,7 @@ public class UserController {
     }
 
     /**
-     * 判断当前用户是否是会计所长
+     * 判断当前用户是否是专家
      */
     @ApiLog("判断当前用户角色是否是专家")
     @GetMapping("isZj")
@@ -1038,6 +1038,24 @@ public class UserController {
         return false;
     }
 
+    /**
+     * 判断当前用户是否是总经办人员
+     */
+    @ApiLog("判断当前用户是否是总经办人员")
+    @GetMapping("isZjbry")
+    @ApiOperation(value = "判断当前用户是否是总经办人员")
+    public boolean isZjbry(){
+        UserDTO currentUserDTO = UserUtils.getCurrentUserDTO();
+        for (RoleDTO roleDTO : currentUserDTO.getRoleDTOList()) {
+            if (ObjectUtils.isNotEmpty(roleDTO)){
+                if ("zjbry".equals(roleDTO.getEnName())){
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
 
 
     /**

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/feign/UserApiImpl.java

@@ -59,6 +59,11 @@ public class UserApiImpl implements IUserApi {
     }
 
     @Override
+    public UserDTO getByLoginNameNoTen(String loginName) {
+        return userService.getByLoginNameNoTen(loginName);
+    }
+
+    @Override
     public UserDTO getByLoginNameNotTenantId(String loginName) {
         if ( StrUtil.isBlank ( loginName )) {
             return null;

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -260,4 +260,6 @@ public interface UserMapper extends BaseMapper <User> {
 
     @InterceptorIgnore(tenantLine = "true")
     String getMobileById(String id);
+
+    UserDTO getByLoginNameNoTen(@Param("loginName") String loginName);
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -588,4 +588,20 @@ select a.id, a.company_id as "companyDTO.id", a.office_id as "officeDTO.id", a.l
         select mobile from sys_user where del_flag = '0' and id = #{id}
     </select>
 
+    <select id="getByLoginNameNoTen" resultType="com.jeeplus.sys.service.dto.UserDTO">
+select a.id, a.company_id as "companyDTO.id", a.office_id as "officeDTO.id", a.login_name as "loginName",
+		a.password,
+		a.no,
+		a.name,
+		a.email, a.phone,
+		a.mobile,
+		a.login_ip as "loginIp", a.login_date as "loginDate",
+		a.remarks,
+		a.login_flag, a.photo, a.qr_code, a.sign,
+		a.create_by_id as "createBy.id", a.create_time, a.update_by_id as "updateBy.id",
+		a.update_time
+		from sys_user a
+		where `name` = #{loginName}
+    </select>
+
 </mapper>

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -697,4 +697,8 @@ public class UserService extends ServiceImpl <UserMapper, User> {
     public String getMobileById(String id) {
         return userMapper.getMobileById(id);
     }
+
+    public UserDTO getByLoginNameNoTen(String loginName) {
+        return userMapper.getByLoginNameNoTen(loginName);
+    }
 }