修复bug

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

@@ -17,20 +17,26 @@
     
     
      <select id="selectPersonList" resultType="Map">
-        SELECT
+     	select * from (
+         SELECT
 			DISTINCT
-			    u. sequence_nbr sequenceNbr,
+			    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 v.field_code when #{item} then v.field_value  end) ${item}</foreach>
+				   <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,
-				jc_alert_form_value v
+				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.sequence_nbr = v.alert_called_id
-			and v.alert_type_code = #{alertTypeCode}
+			where u.parent_id = #{parentId}
+			AND u.biz_org_type = #{bizOrgType}
+			GROUP BY 
+			u.sequence_nbr ,
+			u.biz_org_name ,
+			u.biz_org_code 
+			)a where a.sequenceNbr is not null
 			LIMIT #{pageNum}, #{pageSize}
     </select>
 </mapper>

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.Bean;

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

@@ -290,8 +290,10 @@ public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMappe
 		map.put("pageNum", (pageBean.getCurrent() -1) * pageBean.getSize());
 		map.put("pageSize", pageBean.getSize());
 		map.put("fields", alertFormServiceImpl.queryListByFormId("246"));
-		map.put("alertTypeCode", "246");
-		pageBean.setRecords(this.baseMapper.selectPersonList(map));
+		map.put("bizOrgType", "PERSON");
+		List<Map<String, Object>> list = this.baseMapper.selectPersonList(map);
+		
+		pageBean.setRecords(list);
 		return pageBean;
 	}