Merge remote-tracking branch 'origin/master'

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

@@ -21,14 +21,17 @@ public interface WorkCollectAccessoryMapper extends BaseMapper<WorkCollectAccess
     IPage<WorkCollectAccessory> findPageList(Page<WorkCollectAccessory> page, @Param(Constants.WRAPPER) QueryWrapper<WorkCollectAccessory> workCollectAccessoryMapperQueryWrapper);
 
 
+    @InterceptorIgnore(tenantLine = "true")
     DictType getDictByName(@Param("dictName")String dictName);
 
+    @InterceptorIgnore(tenantLine = "true")
     void insertDictValue(DictValueDTO dictValue);
 
     void deleteAttachment(@Param("id")String id);
 
     List<WorkAttachmentInfo> listWorkAttachment(@Param("attachmentId")String id);
 
+    @InterceptorIgnore(tenantLine = "true")
     List<DictValue> getDictValueByName(@Param("dictName") String dictName,@Param("userId") String userId);
 
 }

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

@@ -77,12 +77,14 @@ public class WorkCollectAccessoryService {
             workCollectAccessoryMapperQueryWrapper.eq("a.office_id", workCollectAccessory.getOfficeId());
         }
 
-        // 个人 - 只判断一次 createById，不要重复设置
         if (StringUtils.isNotBlank(workCollectAccessory.getCreateById())) {
-            // 在这里明确使用括号来确保查询条件的优先级
+            // 明确查询条件的优先级
             workCollectAccessoryMapperQueryWrapper
-                    .and(wrapper -> wrapper.eq("a.create_by_id", workCollectAccessory.getCreateById())
-                            .or().eq("a.collect_user_id", workCollectAccessory.getCreateById()));
+                    .and(wrapper -> wrapper
+                            .and(innerWrapper -> innerWrapper
+                                    .eq("a.create_by_id", workCollectAccessory.getCreateById())
+                                    .ne("a.collect_type", 1)) // 在 create_by_id 条件中添加 collect_type != 1
+                            .or().eq("a.collect_user_id", workCollectAccessory.getCreateById())); // collect_user_id 条件单独处理
         }
 
         IPage<WorkCollectAccessory> iPage = workCollectAccessoryMapper.findPageList(page, workCollectAccessoryMapperQueryWrapper);
@@ -199,7 +201,7 @@ public class WorkCollectAccessoryService {
                 List<DictValue> dictList = getDictValueByName("classification");
                 boolean containsValue = false;
                 for (DictValue dictValue : dictList) {
-                    if (dictValue.getValue().equals(workCollectAccessory.getClassification())) {
+                    if (dictValue.getValue().equals(workCollectAccessory.getClassification()) && userDTO.getId().equals(dictValue.getCreateById()) ) {
                         containsValue = true;
                         break; // 一旦找到匹配值，退出循环
                     }
@@ -252,7 +254,7 @@ public class WorkCollectAccessoryService {
                 List<DictValue> dictList = getDictValueByName("classification");
                 boolean containsValue = false;
                 for (DictValue dictValue : dictList) {
-                    if (dictValue.getValue().equals(workCollectAccessory.getClassification())) {
+                    if (dictValue.getValue().equals(workCollectAccessory.getClassification()) && userDTO.getId().equals(dictValue.getCreateById())) {
                         containsValue = true;
                         break; // 一旦找到匹配值，退出循环
                     }
@@ -345,7 +347,7 @@ public class WorkCollectAccessoryService {
     }
 
     /**
-     * 根据名称添加字典值
+     * 根据名称获取字典值
      */
     @Transactional(rollbackFor = Exception.class)
     public DictType getDictByName(String dictName) {
@@ -357,7 +359,7 @@ public class WorkCollectAccessoryService {
         return workCollectAccessoryMapper.getDictValueByName(dictName,userId);
     }
     /**
-     * 根据名称添加字典值
+     * 查询字典值
      */
     public WorkCollectAccessory queryById(String id) {
         WorkCollectAccessory workCollectAccessory = workCollectAccessoryMapper.selectById(id);