1.合并保单、招聘、人事代码

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -1607,7 +1607,7 @@ public class YgglController {
 	@ApiOperation(value = "62.查询员工列表", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperation(value = "62.查询员工列表", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperationSupport(order = 62)
 	@ApiOperationSupport(order = 62)
 	public Result<List<YgQueryDto>> queryEmpMessage(@CurrentUser UserBean userBean) {
 	public Result<List<YgQueryDto>> queryEmpMessage(@CurrentUser UserBean userBean) {
-		List<YgQueryDto> ygQueryDto = ygglMainEmpMapper.queryEmpMessage(userBean.getOrgCode());
+		List<YgQueryDto> ygQueryDto = ygglMainEmpMapper.queryEmpMessage(userBean.getOrgCode(),0);
 		for (YgQueryDto yg : ygQueryDto) {
 		for (YgQueryDto yg : ygQueryDto) {
 			if (StringUtil.isEmpty(yg.getHeadUrl())) {
 			if (StringUtil.isEmpty(yg.getHeadUrl())) {
 				yg.setHeadUrl("");
 				yg.setHeadUrl("");

src/main/java/cn/timer/api/dao/yggl/YgglMainEmpMapper.java

@@ -49,7 +49,7 @@ public interface YgglMainEmpMapper extends BaseMapper<YgglMainEmp> {
 	 * @param userBean
 	 * @param userBean
 	 * @return
 	 * @return
 	 */
 	 */
-	List<YgQueryDto> queryEmpMessage(@Param("orgCode") Integer orgCode);
+	List<YgQueryDto> queryEmpMessage(@Param("orgCode") Integer orgCode, @Param("isInsure")Integer isInsure);
 	
 	
 	
 	
 	/**
 	/**

src/main/resources/application-test.yml

@@ -261,6 +261,11 @@ insure:
   insuredUrl: 'http://sandbox.portal.unistar-ins.com/mall/Home/Index/createQuotePolicy'
   insuredUrl: 'http://sandbox.portal.unistar-ins.com/mall/Home/Index/createQuotePolicy'
   #查询保单信息
   #查询保单信息
   policyDetail: 'http://sandbox.portal.unistar-ins.com/issuing/Home/Index/policy'
   policyDetail: 'http://sandbox.portal.unistar-ins.com/issuing/Home/Index/policy'
+  #保全
+  appidq: '1000115041006006938'
+  secretq:  '6ba1bf4aa0bd14368c95ff0b9934a17b'
+  uploadUrlq: 'http://sandbox.portal.unistar-ins.com/fuli/Home/Index/file_upload'
+  batchUrl: 'http://sandbox.portal.unistar-ins.com/fuli/Home/WelfareProduct/batch_declare'
 
 
 
 
 youling:
 youling:
@@ -270,9 +275,5 @@ youling:
 h5:
 h5:
   url: 'http://javays.com'
   url: 'http://javays.com'
 
 
-  #保全
-  appidq: '1000115041006006938'
-  secretq:  '6ba1bf4aa0bd14368c95ff0b9934a17b'
-  uploadUrlq: 'http://sandbox.portal.unistar-ins.com/fuli/Home/Index/file_upload'
-  batchUrl: 'http://sandbox.portal.unistar-ins.com/fuli/Home/WelfareProduct/batch_declare'
+
 
 

src/main/resources/mapping/yggl/YgglMainEmpMapper.xml

@@ -266,6 +266,9 @@
 			a.org_code = #{orgCode}
 			a.org_code = #{orgCode}
 		AND
 		AND
 			a.job_status in (0,1,2)
 			a.job_status in (0,1,2)
+		<if test="isInsure!=null and isInsure != ''">
+			AND	a.is_insure=#{isInsure}
+		</if>
 		ORDER BY
 		ORDER BY
 			emp_num DESC
 			emp_num DESC
     </select>
     </select>