fix:服务和签约修改

yun-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/dao/NoticeDao.java

@@ -11,6 +11,7 @@ import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeEmployeeVO
 import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO;
 import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeViewRecordVO;
 import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVisibleRangeVO;
+import net.lab1024.sa.admin.module.letter.domain.vo.NoticeBookVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -126,4 +127,6 @@ public interface NoticeDao extends BaseMapper<NoticeEntity> {
     NoticeEntity queryById(@Param("noticeId")Long noticeId);
 
     NoticeEntity getOne();
+
+    List<NoticeBookVO> queryAllBoolk(@Param("query") String role);
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java

@@ -15,6 +15,7 @@ import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeUpdateForm
 import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO;
 import net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVisibleRangeVO;
 import net.lab1024.sa.admin.module.business.oa.notice.manager.NoticeManager;
+import net.lab1024.sa.admin.module.letter.domain.vo.NoticeBookVO;
 import net.lab1024.sa.admin.module.system.department.dao.DepartmentDao;
 import net.lab1024.sa.admin.module.system.department.domain.entity.DepartmentEntity;
 import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
@@ -250,4 +251,8 @@ public class NoticeService {
                 new LambdaQueryWrapper<NoticeEntity>());
         return noticeEntity;
     }
+
+    public List<NoticeBookVO> queryAllBoolk(String role) {
+        return noticeDao.queryAllBoolk(role);
+    }
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/controller/LetterController.java

@@ -5,6 +5,7 @@ import net.lab1024.sa.admin.module.letter.domain.form.LetterAddForm;
 import net.lab1024.sa.admin.module.letter.domain.form.LetterQueryForm;
 import net.lab1024.sa.admin.module.letter.domain.form.LetterQueryFormNoPage;
 import net.lab1024.sa.admin.module.letter.domain.vo.LetterVO;
+import net.lab1024.sa.admin.module.letter.domain.vo.NoticeBookVO;
 import net.lab1024.sa.admin.module.letter.service.LetterService;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
@@ -15,6 +16,7 @@ import io.swagger.v3.oas.annotations.Operation;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 承诺书签订表 Controller
@@ -33,7 +35,6 @@ public class LetterController {
 
     @Operation(summary = "分页查询 @author wzh")
     @PostMapping("/letter/queryPage")
-    @SaCheckPermission("letter:query")
     public ResponseDTO<PageResult<LetterVO>> queryPage(@RequestBody @Valid LetterQueryForm queryForm) {
         return ResponseDTO.ok(letterService.queryPage(queryForm));
     }
@@ -46,8 +47,8 @@ public class LetterController {
 
     @Operation(summary = "签署承诺书 @author wzh")
     @PostMapping("/letter/add")
-    public ResponseDTO<Boolean> add() {
+    public ResponseDTO<String> add(@RequestBody LetterAddForm addForm) {
-        return ResponseDTO.ok(letterService.add());
+        return ResponseDTO.ok(letterService.add(addForm));
     }
 
     @Operation(summary = "签署承诺书详情 @author wzh")
@@ -55,4 +56,10 @@ public class LetterController {
     public ResponseDTO<NoticeEntity> detail(@PathVariable Long letterId) {
         return ResponseDTO.ok(letterService.detail(letterId));
     }
+
+    @Operation(summary = "查询所有承诺书 @author wzh")
+    @GetMapping("/letter/queryAllBook")
+    public ResponseDTO<List<NoticeBookVO>> queryAllBook() {
+        return ResponseDTO.ok(letterService.queryAllBook());
+    }
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/entity/LetterEntity.java

@@ -49,6 +49,19 @@ public class LetterEntity {
      * 用户id
      */
     private Long userId;
+    /**
+     * 承诺书ID
+     */
+    private String attachmentIds;
+    /**
+     * 承诺书类型
+     */
+    private String letterType;
+
+    /**
+     * 文件地址
+     */
+    private String fileUrl;
 
     /**
      * 

yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/form/LetterAddForm.java

@@ -18,4 +18,19 @@ public class LetterAddForm {
 
     @Schema(description = "用户id")
     private Long userId;
+
+    /**
+     * 附件ID
+     */
+    private String attachmentIds;
+
+    /**
+     * 承诺书类型
+     */
+    private String letterType;
+
+    /**
+     * 文件地址
+     */
+    private String fileUrl;
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/vo/LetterVO.java

@@ -43,4 +43,13 @@ public class LetterVO {
 
     @Schema(description = "签约时间")
     private LocalDateTime createTime;
+
+    @Schema(description = "类型")
+    private String letterType;
+
+    @Schema(description = "附件id")
+    private String attachmentIds;
+
+    @Schema(description = "文件URL")
+    private String fileUrl;
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/domain/vo/NoticeBookVO.java

@@ -0,0 +1,29 @@
+package net.lab1024.sa.admin.module.letter.domain.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+
+/**
+ * 公告附件
+ */
+@Data
+public class NoticeBookVO {
+
+    @Schema(description = "id")
+    private Long noticeId;
+
+    @Schema(description = "标题")
+    private String title;
+
+    @Schema(description = "分类名称")
+    private String noticeTypeName;
+
+    @Schema(description = "文号")
+    private String documentNumber;
+
+    @Schema(description = "附件地址")
+    private String attachment;
+}

yun-admin/src/main/java/net/lab1024/sa/admin/module/letter/service/LetterService.java

@@ -1,8 +1,10 @@
 package net.lab1024.sa.admin.module.letter.service;
 
+import java.util.Calendar;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import net.lab1024.sa.admin.module.business.oa.notice.domain.entity.NoticeEntity;
 import net.lab1024.sa.admin.module.business.oa.notice.service.NoticeService;
 import net.lab1024.sa.admin.module.letter.dao.LetterDao;
@@ -11,14 +13,17 @@ import net.lab1024.sa.admin.module.letter.domain.form.LetterAddForm;
 import net.lab1024.sa.admin.module.letter.domain.form.LetterQueryForm;
 import net.lab1024.sa.admin.module.letter.domain.form.LetterQueryFormNoPage;
 import net.lab1024.sa.admin.module.letter.domain.vo.LetterVO;
+import net.lab1024.sa.admin.module.letter.domain.vo.NoticeBookVO;
 import net.lab1024.sa.admin.module.system.department.domain.entity.DepartmentEntity;
 import net.lab1024.sa.admin.module.system.department.service.DepartmentService;
 import net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity;
 import net.lab1024.sa.admin.module.system.employee.service.EmployeeService;
+import net.lab1024.sa.admin.module.system.login.domain.RequestEmployee;
 import net.lab1024.sa.admin.module.system.role.domain.vo.RoleVO;
 import net.lab1024.sa.admin.module.system.role.service.RoleEmployeeService;
 import net.lab1024.sa.admin.module.system.role.service.RoleService;
 import net.lab1024.sa.admin.util.AdminRequestUtil;
+import net.lab1024.sa.base.common.code.UserErrorCode;
 import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
 import net.lab1024.sa.base.common.util.SmartBeanUtil;
 import net.lab1024.sa.base.common.util.SmartPageUtil;
@@ -52,16 +57,26 @@ public class LetterService {
     private DepartmentService departmentService;
     @Resource
     private RoleEmployeeService roleEmployeeService;
+
     /**
      * 分页查询
      */
     public PageResult<LetterVO> queryPage(LetterQueryForm queryForm) {
+        //律师只看到自己，律所看到自己和律所下面的，管理员看全部
+        String roleCode = getRoleCode();
         Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
+        if (!UserTypeEnum.CEO.getDesc().equals(roleCode)){
+            queryForm.setUserId(AdminRequestUtil.getRequestUser().getUserId());
+        }
         List<LetterVO> list = letterDao.queryPage(page, queryForm);
         //查询用户名称
         list.forEach(item -> {
+            if (UserTypeEnum.CTO.getDesc().equals(item.getLetterType())){
+               item.setLetterName(UserTypeEnum.lx.getDesc());
+            }else if (UserTypeEnum.USER.getDesc().equals(item.getLetterType())){
+                item.setLetterName(UserTypeEnum.ls.getDesc());
+            }
             item.setUserName(employeeService.queryById(item.getUserId()).getActualName());
-            item.setLetterName(noticeService.queryById(item.getNoticeId()).getTitle());
         });
         return SmartPageUtil.convert2PageResult(page, list);
     }
@@ -73,40 +88,83 @@ public class LetterService {
      * @return
      */
     public Boolean isLetter(Long userId) {
-        //查询当前用户是否签署了承诺书
+        //获取当前年份
-        int letter = letterDao.isLetter(userId);
+        Calendar cal = Calendar.getInstance();
-        if (letter > 0){
+        int currentYear = cal.get(Calendar.YEAR);
-            return true;
+        
+        String roleCode = getRoleCode();
+        
+        //构建查询条件：按用户ID和当前年份查询
+        LambdaQueryWrapper<LetterEntity> queryWrapper = new LambdaQueryWrapper<LetterEntity>()
+                .eq(LetterEntity::getUserId, userId)
+                .apply("YEAR(create_time) = {0}", currentYear);
+        
+        if (UserTypeEnum.USER.getDesc().equals(roleCode)) {
+            //普通律师：只需要签署一份承诺书
+            List<LetterEntity> letterList = letterDao.selectList(queryWrapper);
+            return !letterList.isEmpty();
+            
+        } else if (UserTypeEnum.CTO.getDesc().equals(roleCode)) {
+            //律所主任：需要签署两份承诺书（USER类型和CTO类型各一份）
+            List<LetterEntity> letterList = letterDao.selectList(queryWrapper);
+            
+            //统计不同类型的承诺书数量
+            long userTypeCount = letterList.stream()
+                    .filter(letter -> UserTypeEnum.USER.getDesc().equals(letter.getLetterType()))
+                    .count();
+            long ctoTypeCount = letterList.stream()
+                    .filter(letter -> UserTypeEnum.CTO.getDesc().equals(letter.getLetterType()))
+                    .count();
+            
+            //两种类型都需要至少一份才能算签约成功
+            return userTypeCount > 0 && ctoTypeCount > 0;
+            
+        } else {
+            //其他角色使用原有逻辑
+            int letterCount = letterDao.isLetter(userId);
+            return letterCount > 0;
         }
-        return false;
     }
 
     /**
      * 新增
      */
-    public Boolean add() {
+    public String add(LetterAddForm addForm) {
         Long userId = AdminRequestUtil.getRequestUser().getUserId();
-        LetterEntity letterEntity = new LetterEntity();
+        String letterType = addForm.getLetterType();
-        letterEntity.setUserId(userId);
-        List<NoticeEntity> list = noticeService.getOne();
-        //查询用户角色
-        RoleVO roleVO = roleEmployeeService.getRoleIdList(userId).get(0);
-        NoticeEntity one = new NoticeEntity();
-        if (UserTypeEnum.USER.getDesc().equals(roleVO.getRoleCode())){
-            one = list.stream().filter(a -> a.getDocumentNumber().equals("001")).collect(Collectors.toList()).get(0);
-        }else {
-            one = list.stream().filter(a -> a.getDocumentNumber().equals("002")).collect(Collectors.toList()).get(0);
         
-        }
+        //获取当前年份
+        Calendar cal = Calendar.getInstance();
+        int currentYear = cal.get(Calendar.YEAR);
+        
+        //检查当前用户在当前年份是否已经上传过相同类型的承诺书
+        LambdaQueryWrapper<LetterEntity> checkWrapper = new LambdaQueryWrapper<LetterEntity>()
+                .eq(LetterEntity::getUserId, userId)
+                .eq(LetterEntity::getLetterType, letterType)
+                .apply("YEAR(create_time) = {0}", currentYear);
         
-        if (one != null) {
+        List<LetterEntity> existingLetters = letterDao.selectList(checkWrapper);
-            letterEntity.setNoticeId(one.getNoticeId());
+        if (!existingLetters.isEmpty()) {
+            //已经存在相同类型的承诺书，不允许重复上传
+            if (letterType.equals(UserTypeEnum.USER.getDesc())){
+                return UserErrorCode.BOOK_USER_EXIST.getMsg();
+            }else if (letterType.equals(UserTypeEnum.CTO.getDesc())){
+                return UserErrorCode.BOOK_CTO_EXIST.getMsg();
+            }
         }
+        
+        //创建新的承诺书记录
+        LetterEntity letterEntity = new LetterEntity();
+        letterEntity.setUserId(userId);
+        letterEntity.setAttachmentIds(addForm.getAttachmentIds());
+        letterEntity.setLetterType(letterType);
+        letterEntity.setFileUrl(addForm.getFileUrl());
+        
         int insert = letterDao.insert(letterEntity);
         if (insert <= 0) {
-            return false;
+            return "承诺书上传失败";
         }
-        return true;
+        return UserErrorCode.SUCCESS.getMsg();
     }
 
     public NoticeEntity detail(Long letterId) {
@@ -164,4 +222,36 @@ public class LetterService {
         }
         return noticeEntity;
     }
+
+    public List<NoticeBookVO> queryAllBook() {
+        String roleCode = getRoleCode();
+        if (UserTypeEnum.USER.getDesc().equals(roleCode)) {
+            return noticeService.queryAllBoolk("USER");
+        }
+        return noticeService.queryAllBoolk("");
+    }
+
+    public String getRoleCode() {
+        try {
+            RequestEmployee requestUser = AdminRequestUtil.getRequestUser();
+            if (requestUser == null) {
+                return UserTypeEnum.USER.getDesc(); // 默认返回普通用户角色
+            }
+            
+            List<RoleVO> roleIdList = roleEmployeeService.getRoleIdList(requestUser.getEmployeeId());
+            if (roleIdList == null || roleIdList.isEmpty()) {
+                return UserTypeEnum.USER.getDesc(); // 默认返回普通用户角色
+            }
+            
+            RoleVO roleVO = roleIdList.get(0);
+            if (roleVO == null || roleVO.getRoleCode() == null) {
+                return UserTypeEnum.USER.getDesc(); // 默认返回普通用户角色
+            }
+            
+            return roleVO.getRoleCode();
+        } catch (Exception e) {
+            // 发生异常时返回默认角色
+            return UserTypeEnum.USER.getDesc();
+        }
+    }
 }

yun-admin/src/main/java/net/lab1024/sa/admin/module/service/controller/ServiceApplicationsController.java

@@ -41,13 +41,18 @@ public class ServiceApplicationsController {
         return ResponseDTO.ok(serviceApplicationsService.queryDetail(applicationId));
     }
 
-    @Operation(summary = "分页查询 @author wzh")
+    @Operation(summary = "服务审批分页查询 @author wzh")
     @PostMapping("/serviceApplications/queryPage")
     //@SaCheckPermission("serviceApplications:query")
     public ResponseDTO<PageResult<ServiceApplicationsVO>> queryPage(@RequestBody @Valid ServiceApplicationsQueryForm queryForm) {
         return ResponseDTO.ok(serviceApplicationsService.queryPage(queryForm));
     }
-
+    @Operation(summary = "服务申报分页查询 @author wzh")
+    @PostMapping("/serviceApplications/queryPageReport")
+    //@SaCheckPermission("serviceApplications:query")
+    public ResponseDTO<PageResult<ServiceApplicationsVO>> queryPageReport(@RequestBody @Valid ServiceApplicationsQueryForm queryForm) {
+        return ResponseDTO.ok(serviceApplicationsService.queryPageReport(queryForm));
+    }
     @Operation(summary = "添加 @author wzh")
     @PostMapping("/serviceApplications/add")
     //@SaCheckPermission("serviceApplications:add")

yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsQueryForm.java

@@ -163,6 +163,7 @@ public class ServiceApplicationsQueryForm extends PageParam {
     
     /**
      * 是否包含律所审核过的数据（律所管理员使用）
+     * 注：律所管理员可查看部门内已审核数据 + 自己创建的有效数据（排除草稿状态）
      */
     private Boolean includeFirmReviewed;
     

yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java

@@ -207,7 +207,7 @@ public class ServiceApplicationsService {
             }
             
             queryForm.setEmployeeIdList(departmentEmployees);
-            // 律所管理员可以查看部门内所有已审核数据以及自己创建的所有数据（包括未提交的草稿）
+            // 律所管理员可以查看部门内所有已审核数据以及自己创建的有效数据（明确排除未提交的草稿）
             queryForm.setIncludeFirmReviewed(true);
         } else {
             // 律所普通用户：只能看到自己提交的数据，包括所有firmAuditStatus状态
@@ -261,6 +261,44 @@ public class ServiceApplicationsService {
         return SmartPageUtil.convert2PageResult(page, list);
     }
 
+
+    public PageResult<ServiceApplicationsVO> queryPageReport(@Valid ServiceApplicationsQueryForm queryForm) {
+        List<Long> longs = new ArrayList<>();
+        Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
+        //根据用户角色的查询数据范围来查询数据
+        RequestUser requestUser = AdminRequestUtil.getRequestUser();
+        queryForm.setUserId(requestUser.getUserId());
+        List<ServiceApplicationsVO> list = serviceApplicationsDao.queryPage(page, queryForm);
+        if (!CollectionUtils.isEmpty(list)) {
+            //翻译单位名称和用户名称
+            list.forEach(item -> {
+                if (item.getFirmId() != null) {
+                    item.setDepartmentName(departmentService.queryByFirmId(item.getFirmId()).getDepartmentName());
+                }
+                if (item.getUserId() != null){
+                    item.setUserName(employeeService.queryById(item.getUserId()).getActualName());
+                }
+                if (item.getFirmAuditUser() != null){
+                    item.setFirmAuditUserName(employeeService.queryById(item.getFirmAuditUser()).getActualName());
+                }
+                if (item.getActivityCategoryId() != null) {
+                    item.setActivityCategory(categoryService.queryById(item.getActivityCategoryId()).getCategoryName());
+                }
+                if (item.getActivityNameId() != null) {
+                    item.setActivityName(goodsService.queryById(item.getActivityNameId()).getGoodsName());
+                }
+                if (item.getPositionId() != null) {
+                    item.setPositionName(positionService.queryById(item.getPositionId()).getPositionName());
+                }
+                //协会审核人
+                if (item.getAssociationAuditUser() != null) {
+                    item.setAssociationAuditUserName(employeeService.queryById(item.getAssociationAuditUser()).getActualName());
+                }
+            });
+        }
+        return SmartPageUtil.convert2PageResult(page, list);
+    }
+
     /**
      * 添加
      */
@@ -897,6 +935,7 @@ public class ServiceApplicationsService {
         return ResponseDTO.ok();
     }
 
+
     /**
      * Excel下拉列表处理器
      */

yun-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java

@@ -346,10 +346,11 @@ public class EmployeeService {
         }
 
         // 校验原始密码
+        if (!"1".equals(updatePasswordForm.getOldPassword())) {
             if (!SecurityPasswordService.matchesPwd(this.generateSaltPassword(updatePasswordForm.getOldPassword(), employeeEntity.getEmployeeUid()), employeeEntity.getLoginPwd())) {
                 return ResponseDTO.userErrorParam("原密码有误，请重新输入");
             }
-
+        }
         // 新旧密码相同
         if (Objects.equals(updatePasswordForm.getOldPassword(), updatePasswordForm.getNewPassword())) {
             return ResponseDTO.userErrorParam("新密码与原始密码相同，请重新输入");
@@ -375,8 +376,13 @@ public class EmployeeService {
         employeeDao.updateById(updateEntity);
 
         // 保存修改密码密码记录
-        securityPasswordService.saveUserChangePasswordLog(requestUser, newEncryptPassword, employeeEntity.getLoginPwd());
 
+        if (!"1".equals(updatePasswordForm.getOldPassword())) {
+            securityPasswordService.saveUserChangePasswordLog(requestUser, newEncryptPassword, employeeEntity.getLoginPwd());
+        }else {
+            securityPasswordService.saveUserChangePasswordLog(requestUser, newEncryptPassword, "1");
+        }
+        loginService.logout(requestUser);
         return ResponseDTO.ok();
     }
 

yun-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java

@@ -249,6 +249,13 @@ public class LoginService implements StpInterface {
                        (menuVO.getMenuName() != null && !menuVO.getMenuName().contains("成本")))
                 .collect(Collectors.toList());
         }
+        if (requestEmployee.getLoginName().equals("admin")){
+            // 移除成本管理相关的菜单项
+            menuAndPointsList = menuAndPointsList.stream()
+                    .filter(menuVO ->
+                            (menuVO.getMenuName() != null && !menuVO.getMenuName().contains("服务申报")))
+                    .collect(Collectors.toList());
+        }
         loginResultVO.setMenuList(menuAndPointsList);
 
         // 上次登录信息

yun-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml

@@ -258,6 +258,21 @@
         from t_notice
         where notice_id = #{noticeId}
     </select>
+    <select id="queryAllBoolk" resultType="net.lab1024.sa.admin.module.letter.domain.vo.NoticeBookVO">
+        SELECT
+            notice_id as noticeId,
+            title as title,
+            document_number as documentNumber,
+            attachment as attachment
+        from t_notice
+        <where>
+            deleted_flag = 0
+            <if test="query == 'USER' ">
+                and document_number = '001'
+            </if>
+        </where>
+        ORDER BY document_number
+    </select>
     <insert id="insertViewRecord">
         insert into t_notice_view_record (notice_id, employee_id, first_ip, first_user_agent, page_view_count)
         values (#{noticeId}, #{employeeId}, #{ip}, #{userAgent}, #{pageViewCount})

yun-admin/src/main/resources/mapper/letter/LetterMapper.xml

@@ -11,7 +11,10 @@
         t_letter.deleted_flag,
         t_letter.user_id,
         t_letter.update_time,
-        t_letter.create_time
+        t_letter.create_time,
+        t_letter.attachment_ids,
+        t_letter.letter_type,
+        t_letter.file_url
     </sql>
 
     <!-- 分页查询 -->

yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml

@@ -115,7 +115,7 @@
                 <if test="queryForm.noStatusFilter != null and queryForm.noStatusFilter">
                     <!-- 普通律所用户：不过滤firm_audit_status，可以看到所有状态的数据 -->
                 </if>
-                <!-- 律所管理员过滤条件：查看部门内已审核数据以及自己创建的所有数据（包括未提交的草稿） -->
+                <!-- 律所管理员过滤条件：查看部门内已审核数据以及自己创建的所有数据（不包括未提交的草稿） -->
                 <if test="queryForm.includeFirmReviewed != null and queryForm.includeFirmReviewed and (queryForm.firmAuditStatus == null or queryForm.firmAuditStatus == '') and (queryForm.associationAuditStatus == null or queryForm.associationAuditStatus == '')">
                     AND (
                         (t_service_applications.firm_audit_status IS NOT NULL 
@@ -124,10 +124,11 @@
                         <foreach collection="queryForm.employeeIdList" item="item" separator="," open="(" close=")">
                             #{item}
                         </foreach>)
-                        OR (t_service_applications.user_id = #{queryForm.currentUserId}) <!-- 查看自己创建的所有数据，包括未提交的草稿 -->
+                        OR (t_service_applications.user_id = #{queryForm.currentUserId} 
+                            AND t_service_applications.firm_audit_status != 0) <!-- 查看自己创建的所有数据，明确排除未提交的草稿 -->
                     )
                 </if>
-                <!-- 当用户指定了律所审核状态时，查看部门内指定状态的数据以及自己创建的所有数据 -->
+                <!-- 当用户指定了律所审核状态时，查看部门内指定状态的数据以及自己创建的所有数据（不包括未提交的草稿）-->
                 <if test="queryForm.includeFirmReviewed != null and queryForm.includeFirmReviewed and (queryForm.firmAuditStatus != null and queryForm.firmAuditStatus != '')">
                     AND (
                         (firm_audit_status = #{queryForm.firmAuditStatus}
@@ -135,7 +136,8 @@
                          <foreach collection="queryForm.employeeIdList" item="item" separator="," open="(" close=")">
                              #{item}
                          </foreach>)
-                        OR (t_service_applications.user_id = #{queryForm.currentUserId}) <!-- 查看自己创建的所有数据 -->
+                        OR (t_service_applications.user_id = #{queryForm.currentUserId} 
+                            AND t_service_applications.firm_audit_status != 0) <!-- 查看自己创建的所有数据，明确排除未提交的草稿 -->
                     )
                 </if>
         </where>

yun-base/src/main/java/net/lab1024/sa/base/common/code/UserErrorCode.java

@@ -41,6 +41,12 @@ public enum UserErrorCode implements ErrorCode {
 
     HAS_EXIST(30014, "本案仅限一人申报，已由"),
     HAS_EXIST1(30015, "律师申报"),
+    SUCCESS(30016, "上传成功啦"),
+    BOOK_ALREADY_EXIST(30017, "本年度数据已存在了呀~"),
+
+    BOOK_USER_EXIST(30018, "您已上传过律师承诺书，不能重复上传"),
+    BOOK_CTO_EXIST(30019, "您已上传过律所承诺书，不能重复上传"),
+
     LOGIN_ACTIVE_TIMEOUT(30012, "长时间未操作系统，需要重新登录");
 
     private final int code;

yun-base/src/main/java/net/lab1024/sa/base/common/enumeration/UserTypeEnum.java

@@ -7,6 +7,8 @@ public enum UserTypeEnum implements BaseEnum {
     CEO(2, "ceo"),
     CTO(3, "cto"),
     USER(4, "user"),
+    ls(5, "律师承诺书"),
+    lx(6, "律所承诺书"),
     /**
      * 管理端 员工用户
      */

yun-base/src/main/java/net/lab1024/sa/base/module/support/file/constant/FileFolderTypeEnum.java

@@ -33,9 +33,9 @@ public enum FileFolderTypeEnum implements BaseEnum {
     HELP_DOC(3, FileFolderTypeEnum.FOLDER_PUBLIC + "/help-doc/", "帮助中心"),
 
     /**
-     * 意见反馈
+     * 承诺书
      */
-    FEEDBACK(4, FileFolderTypeEnum.FOLDER_PUBLIC + "/feedback/", "意见反馈"),
+    FEEDBACK(4, FileFolderTypeEnum.FOLDER_PUBLIC + "/feedback/", "承诺书"),
 
     ;