修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/OrgUsrMapper.java

@@ -21,4 +21,6 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 	List<Map<String, Object>> selectPersonList(Map<String, Object> map);
 
 	List<OrgUsr> selectCompanyDepartmentMsg();
+
+	List<Map<String, Object>> selectPersonAllList(Map<String, Object> map);
 }

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

@@ -48,6 +48,33 @@
 		</if>
 		LIMIT #{pageNum}, #{pageSize}
 	</select>
+	
+	
+	
+	
+	<select id="selectPersonAllList" resultType="Map">
+		select * from (
+		SELECT
+		DISTINCT
+		u.sequence_nbr sequenceNbr,
+		u.biz_org_name bizOrgName,
+		u.biz_org_code bizOrgCode,
+		<if test="fields != null">
+			<foreach collection="fields" item="item" separator=",">MAX(case f.field_code when #{item} then v.field_value  end) ${item}</foreach>
+		</if>
+		FROM
+		cb_org_usr u LEFT JOIN
+		jc_alert_form_value v on u.sequence_nbr = v.alert_called_id
+		LEFT JOIN jc_alert_form f ON f.sequence_nbr = v.alert_form_id
+		where u.parent_id = #{parentId}
+		AND u.biz_org_type = #{bizOrgType}
+		AND U.is_delete = 0
+		GROUP BY
+		u.sequence_nbr ,
+		u.biz_org_name ,
+		u.biz_org_code
+		)a where a.sequenceNbr is not null
+	</select>
 
 	<select id="selectCompanyDepartmentMsg" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr">
 		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

@@ -53,7 +53,7 @@ public class OrgPersonController {
 	 *
 	 * @return
 	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
 	public ResponseModel saveOrgUsr(HttpServletRequest request, @RequestBody OrgPersonVo OrgPersonVo) throws Exception {

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

@@ -28,6 +28,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.apache.commons.lang3.StringUtils;
@@ -42,6 +43,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 机构/部门/人员表 服务实现类
@@ -218,57 +220,32 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                 AlertFormValue phoneValue = alertFormValueServiceImpl.getOne(phoneWrapper);
                 resultMap.put("tel", phoneValue.getFieldValue());
                 // 获取单位人员列表信息
-                Map<String, Object> personColumnMap = new HashMap<>();
-                personColumnMap.put("is_delete", CommonConstant.IS_DELETE_00);
-                personColumnMap.put("biz_org_code", company.getBizOrgCode());
-                personColumnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
-                Collection<OrgUsr> orgUsrs = listByMap(personColumnMap);
-                orgUsrs.forEach(orgUsr -> {
-                    Map<String, Object> personMap = new HashMap<>();
-                    personMap.put("id", orgUsr.getSequenceNbr());
-                    personMap.put("name", orgUsr.getBizOrgName());
-                    personMap.put("unit", company.getBizOrgName());
-                    QueryWrapper wrapper = new QueryWrapper<AlertFormValue>();
-                    wrapper.eq("alert_called_id", orgUsr.getSequenceNbr());
-                    if (alertFormValueServiceImpl.list(wrapper).size() == 0) {
-                        personMap.put("administrativePositionCode", null);
-                        personMap.put("tel", null);
-                        personMap.put("img", null);
-                        personList.add(personMap);
-                    } else {
-                        // 查询动态表单zhiwei
-                        Map<String, Object> zhiwei = new HashMap<String, Object>();
-                        zhiwei.put("alert_called_id", orgUsr.getSequenceNbr());
-                        zhiwei.put("field_code", "administrativePositionCode");
-                        QueryWrapper zhiweiWrapper = new QueryWrapper<AlertFormValue>();
-                        zhiweiWrapper.allEq(zhiwei);
-                        AlertFormValue zhiweiValue = alertFormValueServiceImpl.getOne(zhiweiWrapper);
-                        personMap.put("administrativePositionCode", zhiweiValue.getFieldValue());
-                        // 查询动态表单Phone
-                        Map<String, Object> personPhone = new HashMap<String, Object>();
-                        personPhone.put("alert_called_id", orgUsr.getSequenceNbr());
-                        personPhone.put("field_code", "telephone");
-                        QueryWrapper personPhoneWrapper = new QueryWrapper<AlertFormValue>();
-                        personPhoneWrapper.allEq(personPhone);
-                        AlertFormValue personPhoneValue = alertFormValueServiceImpl.getOne(personPhoneWrapper);
-                        personMap.put("tel", personPhoneValue.getFieldValue());
-                        // 查询动态表单Img
-                        Map<String, Object> img = new HashMap<String, Object>();
-                        img.put("alert_called_id", orgUsr.getSequenceNbr());
-                        img.put("field_code", "personImg");
-                        QueryWrapper imgWrapper = new QueryWrapper<AlertFormValue>();
-                        imgWrapper.allEq(img);
-                        AlertFormValue imgValue = alertFormValueServiceImpl.getOne(imgWrapper);
-                        personMap.put("img", imgValue.getFieldValue());
-                        personList.add(personMap);
-                    }
-                });
+                personList = listPerson(company.getSequenceNbr()+"").stream().map( p -> {
+                	Map<String, Object> person = new HashMap<>();
+                	person.put("tel", p.get("telephone"));
+                	person.put("img", p.get("personImg"));
+                	person.put("id", p.get("sequenceNbr"));
+                	person.put("name", p.get("bizOrgName"));
+                	person.put("unit", p.get("fireManagementPostCode"));
+                	return person;
+                }).collect(Collectors.toList());
             }
             resultMap.put("children", personList);
             companyPersonMsg.add(resultMap);
         }
         return companyPersonMsg;
     }
+    
+    
+
+    public List<Map<String, Object>> listPerson(String parentId) {
+    	Map<String, Object> map = new HashMap<String, Object>();
+        map.put("fields", alertFormServiceImpl.queryListByFormId("246"));
+        map.put("bizOrgType", "PERSON");
+        map.put("parentId", parentId);
+        List<Map<String, Object>> list = this.baseMapper.selectPersonAllList(map);
+        return list == null ? new ArrayList<Map<String, Object>>() : list;
+    }
 
     public IPage<Map<String, Object>> pagePerson(String pageNum, String pageSize, OrgUsr orgUsr) {
         IPage<Map<String, Object>> pageBean = null;
@@ -362,6 +339,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
     @Override
     public void saveOrgUsrAlertFormValue(OrgUsr orgUsr, List<AlertFormValue> alertFromValuelist) {
+    	orgUsr.setRecDate(new Date());
+    	AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
+    	orgUsr.setRecUserName(user.getRealName());
+    	orgUsr.setRecUserId(user.getUserId());
         // 单位新增情况
         save(orgUsr);
         // 填充主键
@@ -434,8 +415,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         BeanUtils.copyProperties(OrgPersonVo, orgUsr);
         orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
-        AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
-        OrgPersonVo.setAmosOrgCode(user.getRealName());
+        if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
+        	AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
+            OrgPersonVo.setAmosOrgCode(user.getRealName());
+        }
+        
         saveOrgUsrAlertFormValue(orgUsr, OrgPersonVo.getAlertFormValue());
     }
 
@@ -456,11 +440,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
         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());
+        if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
+        	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());