Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-company-app/src/main/java/com/fs/app/controller/CompanyUserController.java

@@ -193,6 +193,7 @@ public class CompanyUserController extends AppBaseController {
         companyUser.setPhonenumber(param.getPhoneNumber());
         companyUser.setPassword(SecurityUtils.encryptPassword(companyUser.getPassword()));
         companyUser.setCreateTime(new Date());
+        companyUser.setIsAudit(0);
 
         // 部门
         CompanyDept dept = companyDeptService.getDefaultCompanyDeptByCompanyId(param.getCompanyId());

fs-company/src/main/java/com/fs/company/controller/CompanyUserController.java

@@ -8,7 +8,6 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
-import com.fs.common.exception.file.OssException;
 import com.fs.common.utils.DomainUtil;
 import com.fs.common.utils.PatternUtils;
 import com.fs.common.utils.ServletUtils;
@@ -26,8 +25,6 @@ import com.fs.core.web.service.TokenService;
 import com.fs.course.config.CourseConfig;
 import com.fs.his.vo.OptionsVO;
 import com.fs.qw.vo.QwUserVO;
-import com.fs.system.oss.CloudStorageService;
-import com.fs.system.oss.OSSFactory;
 import com.fs.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -194,6 +191,7 @@ public class CompanyUserController extends BaseController {
         }
         user.setCreateBy(SecurityUtils.getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setIsAudit(1);
         user.setCreateTime(new Date());
 //        user.setUserType("01");//一般用户
         return toAjax(companyUserService.insertUser(user));

fs-service-system/src/main/java/com/fs/company/cache/ICompanyTagCacheService.java

@@ -1,5 +1,6 @@
 package com.fs.company.cache;
 
+import com.fs.company.domain.CompanyTag;
 import com.fs.company.dto.CompanyIdAndUserDTO;
 
 import java.util.Map;
@@ -7,5 +8,5 @@ import java.util.Map;
 public interface ICompanyTagCacheService {
     String findUserTagByUserId(Long userId);
 
-    Map<Long, String> queryAllTagMap();
+    Map<Long, CompanyTag> queryAllTagMap();
 }

fs-service-system/src/main/java/com/fs/company/cache/impl/CompanyTagCacheServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fs.company.cache.impl;
 
 import com.fs.company.cache.ICompanyTagCacheService;
+import com.fs.company.domain.CompanyTag;
 import com.fs.company.service.ICompanyTagService;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
@@ -20,7 +21,7 @@ public class CompanyTagCacheServiceImpl implements ICompanyTagCacheService {
             .expireAfterWrite(5, TimeUnit.MINUTES)
             .build();
 
-    private static final Cache<Long,Map<Long, String>> COMPANY_USER_TAG_CACHE = Caffeine.newBuilder()
+    private static final Cache<Long,Map<Long, CompanyTag>> COMPANY_USER_TAG_CACHE = Caffeine.newBuilder()
             .maximumSize(1000)
             .expireAfterWrite(5, TimeUnit.MINUTES)
             .build();
@@ -30,7 +31,7 @@ public class CompanyTagCacheServiceImpl implements ICompanyTagCacheService {
     }
 
     @Override
-    public Map<Long, String> queryAllTagMap() {
+    public Map<Long, CompanyTag> queryAllTagMap() {
         return COMPANY_USER_TAG_CACHE.get(0L, e-> companyTagService.queryAllTagMap());
     }
 }

fs-service-system/src/main/java/com/fs/company/mapper/CompanyTagMapper.java

@@ -80,5 +80,5 @@ public interface CompanyTagMapper
 
     String findUserTagByUserId(@Param("userId") Long userId);
     @MapKey("tag_id")
-    Map<Long,String> queryAllTagMap();
+    Map<Long,CompanyTag> queryAllTagMap();
 }

fs-service-system/src/main/java/com/fs/company/service/ICompanyTagService.java

@@ -76,7 +76,7 @@ public interface ICompanyTagService
      */
     List<CompanyTag> selectCompanyTagListByMap(Map<String, Object> params);
 
-    Map<Long,String> queryAllTagMap();
+    Map<Long,CompanyTag> queryAllTagMap();
 
     String findUserTagByUserId(Long key);
 }

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyTagServiceImpl.java

@@ -120,7 +120,7 @@ public class CompanyTagServiceImpl implements ICompanyTagService
     }
 
     @Override
-    public Map<Long, String> queryAllTagMap() {
+    public Map<Long, CompanyTag> queryAllTagMap() {
         return companyTagMapper.queryAllTagMap();
     }
 

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -526,13 +526,15 @@ public class FsUserServiceImpl implements IFsUserService
                 String userTagByUserId = companyTagCacheService.findUserTagByUserId(item.getUserId());
                 if(StringUtils.isNotEmpty(userTagByUserId)) {
                     String[] split = userTagByUserId.split(",");
-                    Map<Long, String> tagMap = companyTagCacheService.queryAllTagMap();
+                    Map<Long, CompanyTag> tagMap = companyTagCacheService.queryAllTagMap();
                     Set<String> tagNames = new HashSet<>();
                     for (String tag : split) {
                         if(tag != null) {
                             Long tagL = Long.parseLong(tag);
-                            String tagName = tagMap.get(tagL);
-                            tagNames.add(tagName);
+                            CompanyTag companyTag = tagMap.get(tagL);
+                            if(companyTag != null) {
+                                tagNames.add(companyTag.getTag());
+                            }
                         }
                     }
                     item.setTagIds(userTagByUserId);