| 
					
				 | 
			
			
				@@ -43,7 +43,7 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     AdminCompanyWechatService AdminCompanyWechatService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     CommonFileService commonFileService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//    @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //    @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //    RegionService regionService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     AdminUserService adminUserService; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -69,9 +69,9 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return ossUtil.getConfig(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public SysConfig getSysConfig(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public SysConfig getSysConfig() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         SysConfig sysConfig = sysConfigService.lambdaQuery().last("limit 1").one(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(sysConfig == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (sysConfig == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             throw new RemoteServiceException("系统缺少必要配置,请联系相关人员"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return sysConfig; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -79,12 +79,13 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 查询服务商的所有账号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param serviceProviderId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public List<AdminUser> getAdminUserByServiceProviderId(String serviceProviderId){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public List<AdminUser> getAdminUserByServiceProviderId(String serviceProviderId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<AdminUser> list = adminUserService.lambdaQuery() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                .eq(AdminUser::getStatus,true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .eq(AdminUser::getStatus, true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(AdminUser::getServiceProviderId, serviceProviderId).list(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return list; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -92,25 +93,27 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 获取用户信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param mobile 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param flag 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public User getUserByMobile(String mobile,Integer flag){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(StringUtils.isBlank(mobile) || flag == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public User getUserByMobile(String mobile, Integer flag) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (StringUtils.isBlank(mobile) || flag == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             throw new RemoteServiceException("获取用户信息失败,缺少必要的参数"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return userService.lambdaQuery() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                .eq(User::getMobile,mobile) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                .eq(User::getFlag,flag) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .eq(User::getMobile, mobile) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .eq(User::getFlag, flag) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .one(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 查询当前PC用户 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public AdminUserCom getAdminUser(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public AdminUserCom getAdminUser() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         HttpServletRequest request = ApplicationContextUtils.getHttpServletRequest(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return this.getAdminUser(request); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -118,47 +121,46 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 获取帐号以及部门id集合 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public AdminUserCom getAdminUser(HttpServletRequest request){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public AdminUserCom getAdminUser(HttpServletRequest request) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String userId = CommonUtils.getUserId(request); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //方便测试用 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(StringUtils.isBlank(userId) && !active.equals("prd")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (StringUtils.isBlank(userId) && !active.equals("prd")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             AdminUser admin = adminUserService.lambdaQuery().eq(AdminUser::getUserName, "admin").one(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             AdminUserCom adminUserCom = new AdminUserCom(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            BeanUtils.copyProperties(admin,adminUserCom); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            BeanUtils.copyProperties(admin, adminUserCom); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById("1"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             adminUserCom.setAdminCompanyWechat(adminCompanyWechat); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return adminUserCom; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         AdminUser adminUser = adminUserService.getById(userId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(adminUser == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (adminUser == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(!adminUser.getStatus()){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (!adminUser.getStatus()) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             throw new RemoteServiceException("帐号已被禁用"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         AdminUserCom adminUserCom = new AdminUserCom(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        BeanUtils.copyProperties(adminUser,adminUserCom); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        BeanUtils.copyProperties(adminUser, adminUserCom); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //所有帐号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        AdminUserCom account2 = this.websitAccount(adminUserCom,request); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        AdminUserCom account2 = this.websitAccount(adminUserCom, request); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(account2 != null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (account2 != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return account2; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         adminUserCom.setCompanyWechatIds(ListUtil.toList("1")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //暂不过滤权限 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //adminUserCom.setAdminWebsitIds(null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return adminUserCom; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 部门帐号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public AdminUserCom websitAccount(AdminUserCom adminUserCom,HttpServletRequest request){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public AdminUserCom websitAccount(AdminUserCom adminUserCom, HttpServletRequest request) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         AdminWebsit adminWebsit = adminWebsitService.getById(adminUserCom.getAdminWebsitId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         adminUserCom.setAdminWebsit(adminWebsit); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //非平台账号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(!adminUserCom.getUserName().equals("admin")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (!adminUserCom.getUserName().equals("admin")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             List<AdminWebsit> list = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             list.addAll(this.queryAllChild(list, adminUserCom.getAdminWebsitId())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             List<String> websitIds = list.stream().map(AdminWebsit::getWebsitId).distinct().collect(Collectors.toList()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -166,7 +168,7 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             adminUserCom.setAdminWebsitIds(websitIds.stream().distinct().collect(Collectors.toList())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //平台业务员的区id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if(StringUtils.equals(adminUserCom.getType(), RoleTypeEnum.A.getCode())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (StringUtils.equals(adminUserCom.getType(), RoleTypeEnum.A.getCode())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 //区域id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 List<AdminWebsitRegion> adminWebsitRegions = adminWebsitRegionService.lambdaQuery().in(AdminWebsitRegion::getAdminWebsitId, adminUserCom.getAdminWebsitIds()).list(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 adminUserCom.setAreaIds(adminWebsitRegions.stream().map(AdminWebsitRegion::getAreaId).distinct().collect(Collectors.toList())); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -177,7 +179,7 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return adminUserCom; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public User getUser(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public User getUser() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         HttpServletRequest request = ApplicationContextUtils.getHttpServletRequest(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         String userId = CommonUtils.getUserId(request); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         User user = userService.getById(userId); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -187,16 +189,16 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 递归查询所有数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public List<AdminWebsit> queryAllChild(List<AdminWebsit> list,String id){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(id == null || id.equals("0")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public List<AdminWebsit> queryAllChild(List<AdminWebsit> list, String id) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (id == null || id.equals("0")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return list; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<AdminWebsit> adminWebsits = adminWebsitService.lambdaQuery().eq(AdminWebsit::getParentId, id).list(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(adminWebsits.size() == 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (adminWebsits.size() == 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return list; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        for(AdminWebsit adminWebsit:adminWebsits){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            this.queryAllChild(list,adminWebsit.getWebsitId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        for (AdminWebsit adminWebsit : adminWebsits) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            this.queryAllChild(list, adminWebsit.getWebsitId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         list.addAll(adminWebsits); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return list; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -204,6 +206,7 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 上传附件 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param file 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @throws IOException 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -257,7 +260,7 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return url; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public List<LbsAmap> city2(String city){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public List<LbsAmap> city2(String city) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<LbsAmap> citys = lbsAmapService.lambdaQuery() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(LbsAmap::getStatus, StateEnum.ON.getKey()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .like(LbsAmap::getName, city) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -267,7 +270,7 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public AdminCompanyWechat getAdminCompanyWechat(String subAppId){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public AdminCompanyWechat getAdminCompanyWechat(String subAppId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         AdminCompanyWechat one = adminCompanyWechatService.lambdaQuery().eq(AdminCompanyWechat::getSubAppId, subAppId).last("limit 1").one(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return one; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -275,16 +278,16 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 附件归属绑定 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public void bindFileFile(String objId,String objType,List<CommonFile> fileIds){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(CollectionUtil.isEmpty(fileIds)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public void bindFileFile(String objId, String objType, List<CommonFile> fileIds) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (CollectionUtil.isEmpty(fileIds)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //先删除后绑定 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         commonFileService.lambdaUpdate() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                .eq(CommonFile::getObjId,objId) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                .eq(CommonFile::getObjType,objType).remove(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .eq(CommonFile::getObjId, objId) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .eq(CommonFile::getObjType, objType).remove(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        for(CommonFile file : fileIds) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        for (CommonFile file : fileIds) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             file.setId(null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             file.setObjId(objId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             file.setObjType(objType); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -295,10 +298,10 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 查询附件列表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public List<CommonFile> queryFileByObjId(String objId,String objType){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public List<CommonFile> queryFileByObjId(String objId, String objType) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return commonFileService.lambdaQuery() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                .eq(CommonFile::getObjId,objId) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                .eq(CommonFile::getObjType,objType) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .eq(CommonFile::getObjId, objId) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                .eq(CommonFile::getObjType, objType) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .orderByAsc(CommonFile::getCreateTime) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .list(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -306,9 +309,9 @@ public class CommonLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 查询附件列表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public List<String> queryFileUrlsByObjId(String objId,String objType){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public List<String> queryFileUrlsByObjId(String objId, String objType) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<CommonFile> commonFiles = this.queryFileByObjId(objId, objType); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(commonFiles.size() == 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (commonFiles.size() == 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return commonFiles.stream().map(CommonFile::getUrl).collect(Collectors.toList()); 
			 |