修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -40,6 +40,12 @@
 		u.biz_org_name ,
 		u.biz_org_code
 		)a where a.sequenceNbr is not null
+		<if  test="bizOrgName != null">
+			AND u.bizOrgName = #{bizOrgName}
+		</if>
+		<if  test="bizOrgCode != null">
+			AND u.bizOrgName = #{bizOrgCode}
+		</if>
 		LIMIT #{pageNum}, #{pageSize}
 	</select>
 

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

@@ -89,6 +89,21 @@ public class OrgPersonController {
 		return ResponseHelper.buildResponse(null);
 	}
 
+	
+    /**
+     * 根据id查询人员
+     *
+     * @param request
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取人员详情", notes = "获取人员详情")
+    public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) throws Exception {
+        return ResponseHelper.buildResponse(iOrgUsrService.selectPersonById(id));
+    }
 
 	/**
 	 *

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

@@ -278,6 +278,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
         QueryWrapper<OrgUsr> orgUsrQueryWrapper = new QueryWrapper<>();
+        orgUsr.setBizOrgType("PERSON");
         Class<? extends OrgUsr> aClass = orgUsr.getClass();
         Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
             try {
@@ -294,7 +295,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                         orgUsrQueryWrapper.eq(name, fileValue);
                     } else if (type.equals(String.class)) {
                         String fileValue = (String) field.get(orgUsr);
-                        orgUsrQueryWrapper.eq(name, fileValue);
+                        orgUsrQueryWrapper.like(name, fileValue);
                     } else {
                         String fileValue = (String) field.get(orgUsr);
                         orgUsrQueryWrapper.eq(name, fileValue);
@@ -308,7 +309,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         map.put("pageNum", (pageBean.getCurrent() - 1) * pageBean.getSize());
         map.put("pageSize", pageBean.getSize());
         map.put("fields", alertFormServiceImpl.queryListByFormId("246"));
-        pageBean.setRecords(this.baseMapper.selectPersonList(map));
         map.put("bizOrgType", "PERSON");
         List<Map<String, Object>> list = this.baseMapper.selectPersonList(map);
 
@@ -355,6 +355,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         orgUsr.setRecDate(new Date());
         orgUsr.setRecUserId(oriOrgUsr.getRecUserId());
         orgUsr.setRecUserName(oriOrgUsr.getRecUserName());
+        orgUsr.setAmosOrgId(oriOrgUsr.getAmosOrgId());
+        orgUsr.setAmosOrgCode(oriOrgUsr.getAmosOrgCode());
         updateById(orgUsr);
     }
 
@@ -376,7 +378,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         alertFromValuelist.stream().forEach(alertFromValue -> {
             alertFromValue.setAlertCalledId(orgUsr.getSequenceNbr());
         });
-        List<AlertFromValueDto> formList = alertFormValueServiceImpl.queryByCalledId(alertCalledId);
+        List<AlertFromValueDto> formList = alertFormValueServiceImpl.queryByCalledId(orgUsr.getSequenceNbr());
         for (AlertFormValue dis : alertFromValuelist) {
             for (AlertFromValueDto src : formList) {
                 if (dis.getAlertFormId() == src.getAlertFormId()) {
@@ -385,6 +387,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                     dis.setRecUserId(orgUsr.getRecUserId());
                     dis.setRecUserName(orgUsr.getRecUserName());
                     dis.setAlertTypeCode(src.getAlertTypeCode());
+                    dis.setAlertFormId(src.getAlertFormId());
                     break;
                 }
             }
@@ -455,7 +458,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         BeanUtils.copyProperties(OrgPersonVo, orgUsr);
         AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
         oriOrgUsr.setAmosOrgCode(user.getRealName());
+        oriOrgUsr.setAmosOrgId(user.getUserId());
         orgUsr.setAmosOrgCode(user.getRealName());
+        orgUsr.setAmosOrgId(user.getUserId());
         saveOrgUsr(oriOrgUsr, id);
         // 保存动态表单数据
         updateAlertFormValue(oriOrgUsr, orgUsr.getSequenceNbr(), OrgPersonVo.getAlertFormValue());