资料库收藏分类调整

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/workCollectAccessory/mapper/xml/WorkCollectAccessoryMapper.xml

@@ -89,7 +89,8 @@
     <select id="getDictValueByName" resultType="com.jeeplus.pubmodules.workCollectAccessory.service.dto.DictValue">
         SELECT v.label,
                v.value,
-               v.sort
+               v.sort,
+               v.create_by_id
         FROM `sys_dict_value` v
         LEFT JOIN `sys_dict_type` t ON v.dict_type_id = t.id
         WHERE t.type = #{dictName} and v.create_by_id = #{userId}

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/workCollectAccessory/service/WorkCollectAccessoryService.java

@@ -149,7 +149,6 @@ public class WorkCollectAccessoryService {
 //        判断并设置共享状态
         if(StringUtils.isNotEmpty(companyId)){
             if("1".equals(shareType)){
-
                 newAttachment.setOfficeId(companyId);
                 newAttachment.setOfficeShare("1");
             }else{
@@ -285,28 +284,6 @@ public class WorkCollectAccessoryService {
     }
 
     /**
-     * 生成uuid
-     * @return
-     */
-    public static String generateId() {
-        UUID uuid = UUID.randomUUID();
-        BigInteger id = new BigInteger(uuid.toString().replace("-", ""), 16);
-        return id.toString();
-    }
-
-    /**
-     * 随机生成
-     * @return
-     */
-    public static String generateRandomString() {
-        Random random = new Random();
-        // 随机生成一个 99 到 1000 之间的整数
-        int randomNumber = 99 + random.nextInt(1000 - 99);
-        // 返回整数转为字符串
-        return String.valueOf(randomNumber);
-    }
-
-    /**
      * 保存附件信息
      * @param list 待保存的附件列表
      * @param userDTO 当前登录用户
@@ -347,24 +324,44 @@ public class WorkCollectAccessoryService {
     }
 
     /**
-     * 根据名称获取字典值
+     * 根据id查询当前附件信息
+     */
+    public WorkCollectAccessory queryById(String id) {
+        WorkCollectAccessory workCollectAccessory = workCollectAccessoryMapper.selectById(id);
+        return workCollectAccessory;
+    }
+    /**
+     * 根据字典名称获取字典值
      */
     @Transactional(rollbackFor = Exception.class)
     public DictType getDictByName(String dictName) {
-      return  workCollectAccessoryMapper.getDictByName(dictName);
+        return  workCollectAccessoryMapper.getDictByName(dictName);
     }
     public List<DictValue> getDictValueByName(String dictName){
         UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         String userId = userDTO.getId();
         return workCollectAccessoryMapper.getDictValueByName(dictName,userId);
     }
+
     /**
-     * 查询字典值
+     * 生成uuid
+     * @return
      */
-    public WorkCollectAccessory queryById(String id) {
-        WorkCollectAccessory workCollectAccessory = workCollectAccessoryMapper.selectById(id);
-        return workCollectAccessory;
+    public static String generateId() {
+        UUID uuid = UUID.randomUUID();
+        BigInteger id = new BigInteger(uuid.toString().replace("-", ""), 16);
+        return id.toString();
     }
 
-
+    /**
+     * 随机生成
+     * @return
+     */
+    public static String generateRandomString() {
+        Random random = new Random();
+        // 随机生成一个 99 到 1000 之间的整数
+        int randomNumber = 99 + random.nextInt(1000 - 99);
+        // 返回整数转为字符串
+        return String.valueOf(randomNumber);
+    }
 }