员工列表优化,电子合同创建个人账户身份类型更新

src/main/java/cn/timer/api/config/interceptor/WebSecurityConfig.java

@@ -10,7 +10,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 

src/main/java/cn/timer/api/controller/dzht/DzhtController2.java

@@ -101,13 +101,13 @@ public class DzhtController2 {
 			String name = yg.getName();
 			String name = yg.getName();
 			Integer type = yg.getZjType();
 			Integer type = yg.getZjType();
 			String idType = null;
 			String idType = null;
-			if (type == 1) {
+			if (type == 0) {
 				idType = "CRED_PSN_CH_IDCARD";// 大陆身份证
 				idType = "CRED_PSN_CH_IDCARD";// 大陆身份证
-			} else if (type == 2) {
+			} else if (type == 1) {
 				idType = "CRED_PSN_CH_HONGKONG";// 香港通行证
 				idType = "CRED_PSN_CH_HONGKONG";// 香港通行证
-			} else if (type == 3) {
+			} else if (type == 2) {
 				idType = "CRED_PSN_CH_TWCARD";// 台湾通行证
 				idType = "CRED_PSN_CH_TWCARD";// 台湾通行证
-			} else if (type == 4) {
+			} else if (type == 3) {
 				idType = "CRED_PSN_FOREIGN";// 外籍护照
 				idType = "CRED_PSN_FOREIGN";// 外籍护照
 			}
 			}
 			String idNumber = yg.getZjNum();
 			String idNumber = yg.getZjNum();

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

@@ -1020,7 +1020,9 @@ public class YgglController {
 				ygQueryDto.getCurrentPage() == null ? 1 : ygQueryDto.getCurrentPage(),
 				ygQueryDto.getCurrentPage() == null ? 1 : ygQueryDto.getCurrentPage(),
 				ygQueryDto.getTotalPage() == null ? 10 : ygQueryDto.getTotalPage());
 				ygQueryDto.getTotalPage() == null ? 10 : ygQueryDto.getTotalPage());
 		QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
 		QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("org_code", orgCode).eq(t != null && t > -1, "job_type", t)
+		queryWrapper.
+		select("name","emp_num","bmgw_id","rz_time","job_type","phone","job_status")
+		.eq("org_code", orgCode).eq(t != null && t > -1, "job_type", t)
 				.eq(j != null && j > -1, "job_status", j).in(!bList.isEmpty(), "id", bList)
 				.eq(j != null && j > -1, "job_status", j).in(!bList.isEmpty(), "id", bList)
 				.and(!StrUtil.hasBlank(q), wq -> wq.like("name", q).or().like("phone", q));
 				.and(!StrUtil.hasBlank(q), wq -> wq.like("name", q).or().like("phone", q));
 //		List<YgglMainEmp> lo = YgglMainEmp.builder().build().selectList(queryWrapper);
 //		List<YgglMainEmp> lo = YgglMainEmp.builder().build().selectList(queryWrapper);