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

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.converter.HttpMessageConverter;
 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.WebMvcConfigurer;
 

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

@@ -210,10 +210,10 @@ public class DzhtController2 {
 //		List<Integer> orgCodeList = Lists.transform(list, newList -> newList.getOrgCode());
 		List<String> orgIds = new ArrayList<String>();
 //		for (Integer orgCode : orgCodeList) {
-			DzhtAssoQyzc qyzc = DzhtAssoQyzc.builder().build().selectOne(new QueryWrapper<DzhtAssoQyzc>().lambda()
-					.eq(DzhtAssoQyzc::getOrgCode, userBean.getOrgCode()).select(DzhtAssoQyzc::getOrgId));
-			if (qyzc != null)
-				orgIds.add(qyzc.getOrgId());
+		DzhtAssoQyzc qyzc = DzhtAssoQyzc.builder().build().selectOne(new QueryWrapper<DzhtAssoQyzc>().lambda()
+				.eq(DzhtAssoQyzc::getOrgCode, userBean.getOrgCode()).select(DzhtAssoQyzc::getOrgId));
+		if (qyzc != null)
+			orgIds.add(qyzc.getOrgId());
 //		}
 		JSONObject j = null;
 		List<JSONObject> result = new ArrayList<JSONObject>();
@@ -276,7 +276,7 @@ public class DzhtController2 {
 	@GetMapping("/qryOrgSeal")
 	@ApiOperation(value = "查询机构模板印章", httpMethod = "GET", notes = "接口发布说明")
 	public Result<Object> qryOrgSeal(@CurrentUser UserBean userBean, @RequestParam Integer offset,
-			@RequestParam Integer size) {
+									 @RequestParam Integer size) {
 		JSONObject a = null;
 		try {
 			TokenHelper.getTokenData();// 获取鉴权
@@ -298,7 +298,7 @@ public class DzhtController2 {
 	@PostMapping("/addComponents/{templateId}")
 	@ApiOperation(value = "添加输入项组件", httpMethod = "POST", notes = "接口发布说明")
 	public Result<Object> addComponents(@PathVariable String templateId,
-			@RequestBody List<StructComponent> structComponents) {
+										@RequestBody List<StructComponent> structComponents) {
 
 		List<String> l = new ArrayList<String>();
 		for (StructComponent structComponent : structComponents) {
@@ -867,7 +867,7 @@ public class DzhtController2 {
 	@GetMapping("/qrySignArea")
 	@ApiOperation(value = "查询签署区列表", httpMethod = "GET", notes = "接口发布说明")
 	public Result<Object> qrySignArea(@RequestParam String flowId, @RequestParam(required = false) String accountId,
-			@RequestParam(required = false) String signfieldIds) {
+									  @RequestParam(required = false) String signfieldIds) {
 		JSONObject json = null;
 		try {
 			TokenHelper.getTokenData();// 获取鉴权
@@ -932,7 +932,7 @@ public class DzhtController2 {
 	@GetMapping("/qrySignUrl")
 	@ApiOperation(value = "获取签署地址", httpMethod = "GET", notes = "接口发布说明")
 	public Result<Object> qrySignUrl(@CurrentUser UserBean userBean, @RequestParam String flowId,
-			@RequestParam(required = false) String organizeId, @RequestParam(required = false) String urlType) {
+									 @RequestParam(required = false) String organizeId, @RequestParam(required = false) String urlType) {
 		JSONObject json = null;
 		try {
 			QueryWrapper<DzhtAssoGrzc> queryWrapper = new QueryWrapper<DzhtAssoGrzc>();
@@ -954,8 +954,8 @@ public class DzhtController2 {
 	@PutMapping("/rushsign")
 	@ApiOperation(value = "流程签署人催签", httpMethod = "PUT", notes = "接口发布说明")
 	public Result<Object> rushsign(@CurrentUser UserBean userBean, @RequestParam String flowId,
-			@RequestParam(required = false) String noticeTypes,
-			@RequestParam(required = false) String rushsignAccountId) {
+								   @RequestParam(required = false) String noticeTypes,
+								   @RequestParam(required = false) String rushsignAccountId) {
 		try {
 			TokenHelper.getTokenData();// 获取鉴权
 
@@ -974,7 +974,7 @@ public class DzhtController2 {
 	@PutMapping("/revoke")
 	@ApiOperation(value = "撤回签署流程", httpMethod = "PUT", notes = "接口发布说明")
 	public Result<Object> revoke(@CurrentUser UserBean userBean, @RequestParam String flowId,
-			@RequestParam(required = false) String revokeReason) {
+								 @RequestParam(required = false) String revokeReason) {
 		String operatorId = null;
 		try {
 			TokenHelper.getTokenData();// 获取鉴权
@@ -1027,16 +1027,16 @@ public class DzhtController2 {
 
 	/**
 	 * 获取当前用户发起的签署流程
-	 * 
+	 *
 	 * @param flowId
 	 * @return
 	 */
 	@GetMapping("/getFqlc")
 	@ApiOperation(value = "当前用户发起的签署流程", httpMethod = "GET", notes = "接口发布说明")
 	public Result<Object> getFqlc(@CurrentUser UserBean userBean,
-			@RequestParam(required = false, defaultValue = "1") Integer currPage,
-			@RequestParam(required = false, defaultValue = "10") Integer pageSize,
-			@RequestParam(required = false) String query) {
+								  @RequestParam(required = false, defaultValue = "1") Integer currPage,
+								  @RequestParam(required = false, defaultValue = "10") Integer pageSize,
+								  @RequestParam(required = false) String query) {
 		com.github.pagehelper.Page<Object> page = PageHelper.startPage(currPage, pageSize);
 		List<DzhtAssoCjlc> cjlcs = DzhtAssoCjlc.builder().build()
 				.selectList(new QueryWrapper<DzhtAssoCjlc>().like(query != null, "business_scene", query)
@@ -1089,18 +1089,18 @@ public class DzhtController2 {
 
 	/**
 	 * 获取当前用户收到的签署流程
-	 * 
+	 *
 	 * @param currPage
-	 * 
+	 *
 	 * @param flowId
 	 * @return
 	 */
 	@GetMapping("/getSdlc")
 	@ApiOperation(value = "当前用户收到的签署流程", httpMethod = "GET", notes = "接口发布说明")
 	public Result<Object> getSdlc(@CurrentUser UserBean userBean,
-			@RequestParam(required = false, defaultValue = "1") Integer currPage,
-			@RequestParam(required = false, defaultValue = "10") Integer pageSize,
-			@RequestParam(required = false) String query) {
+								  @RequestParam(required = false, defaultValue = "1") Integer currPage,
+								  @RequestParam(required = false, defaultValue = "10") Integer pageSize,
+								  @RequestParam(required = false) String query) {
 
 		List<JSONObject> json = new ArrayList<JSONObject>();
 		com.github.pagehelper.Page<Object> page = PageHelper.startPage(currPage, pageSize);