修改责任人

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/core/framework/PersonIdentifyAspect.java

@@ -47,6 +47,7 @@ public class PersonIdentifyAspect {
             personIdentity.setPersonSeq(userDto.getPersonSeq());
             personIdentity.setPersonName(userDto.getPersonName());
             personIdentity.setIdentityType(userDto.getIdentityType());
+            personIdentity.setCompanyBizOrgCode(userDto.getCompanyBizOrgCode());
             reginParam.setPersonIdentity(personIdentity);
             redisUtils.set(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()), JSONObject.toJSONString(reginParam));
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -245,6 +245,25 @@ public class OrgPersonController extends BaseController {
     }
 
 
+
+    @PersonIdentify
+    @TycloudOperation( ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/listAllByCurrentUserALL", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询(表单用)", notes = "列表分页查询（表单用）")
+    public ResponseModel<Object> listAllByCurrentUserALL() {
+        Map<String, Object> req = new HashMap<>();
+        ReginParams reginParams = getSelectedOrgInfo();
+        String bizOrgCode = reginParams.getPersonIdentity().getCompanyBizOrgCode();
+        req.put("bizOrgCode", bizOrgCode);
+//        if(redisUtils.get("userList:" + bizOrgCode) != null){
+//            return ResponseHelper.buildResponse(redisUtils.get("userList:" + bizOrgCode));
+//        }
+        return ResponseHelper.buildResponse(iOrgUsrService.listAllByCurrentUser(null, null, req));
+    }
+
+
+
+
     @TycloudOperation( ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getUserByCode/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -2798,6 +2798,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				userDto.setBizOrgCode(bizOrg.getBizOrgCode());
 				userDto.setCompanyId(String.valueOf(bizOrg.getSequenceNbr()));
 				userDto.setCompanyName(bizOrg.getBizOrgName());
+				if(bizOrg.getBizOrgType().equals("COMPANY")){
+					userDto.setCompanyBizOrgCode(bizOrg.getBizOrgCode());
+				}else{
+					userDto.setCompanyBizOrgCode(getCompany(bizOrg));
+				}
 			} else {
 				throw new RuntimeException("人员所在公司不存在");
 			}