fix:用户修改

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

@@ -152,12 +152,12 @@ public class LetterService {
             contentHtml = contentHtml.replace("律师事务所自愿", "[ "+departmentEntity.getDepartmentName()+" ]自愿");
             contentHtml = contentHtml.replace("年度", "[ "+year + " ]年度");
             contentHtml = contentHtml.replace("主任（签字）：", "主任（签字）：" + employeeEntity.getActualName());
-            contentHtml = contentHtml.replace("日期", "日期：" + letterEntity.getCreateTime().toLocalDate().toString());
+            contentHtml = contentHtml.replace("日期：", "日期：" + letterEntity.getCreateTime().toLocalDate().toString());
             
             contentText = contentText.replace("律师事务所自愿", "[ "+departmentEntity.getDepartmentName()+" ]自愿");
             contentText = contentText.replace("年度", "[ "+year + " ]年度");
             contentText = contentText.replace("主任（签字）：", "主任（签字）：" + employeeEntity.getActualName());
-            contentText = contentText.replace("日期", "日期：" + letterEntity.getCreateTime().toLocalDate());
+            contentText = contentText.replace("日期：", "日期：" + letterEntity.getCreateTime().toLocalDate());
 
             noticeEntity.setContentHtml(contentHtml);
             noticeEntity.setContentText(contentText);

yun-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/domain/form/EmployeeAddForm.java

@@ -47,7 +47,6 @@ public class EmployeeAddForm {
     private String phone;
 
     @Schema(description = "邮箱账号")
-    @NotNull(message = "邮箱账号不能为空")
     @Pattern(regexp = SmartVerificationUtil.EMAIL, message = "邮箱账号格式不正确")
     private String email;
 
@@ -55,7 +54,7 @@ public class EmployeeAddForm {
     private Long positionId;
 
     @Schema(description = "角色列表")
-    private List<Long> roleIdList;
+    private Long roleIdList;
 
     @Schema(description = "备注")
     @Length(max = 200, message = "备注最多200字符")

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

@@ -146,7 +146,9 @@ public class EmployeeService {
 
         // 保存数据
         entity.setDeletedFlag(Boolean.FALSE);
-        employeeManager.saveEmployee(entity, employeeAddForm.getRoleIdList());
+        List<Long> ids = new ArrayList<>();
+        ids.add(employeeAddForm.getRoleIdList());
+        employeeManager.saveEmployee(entity, ids);
 
         return ResponseDTO.ok(randomPassword);
     }
@@ -178,9 +180,10 @@ public class EmployeeService {
         EmployeeEntity entity = SmartBeanUtil.copy(employeeUpdateForm, EmployeeEntity.class);
         // 不更新密码
         entity.setLoginPwd(null);
-
+        List<Long> ids = new ArrayList<>();
+        ids.add(employeeUpdateForm.getRoleIdList());
         // 更新数据
-        employeeManager.updateEmployee(entity, employeeUpdateForm.getRoleIdList());
+        employeeManager.updateEmployee(entity, ids);
 
         // 清除员工缓存
         loginService.clearLoginEmployeeCache(employeeId);
@@ -227,10 +230,10 @@ public class EmployeeService {
             return ResponseDTO.userErrorParam("登录名重复");
         }
 
-        existEntity = employeeDao.getByPhone(phone, null);
+        /*existEntity = employeeDao.getByPhone(phone, null);
         if (null != existEntity && !Objects.equals(existEntity.getEmployeeId(), employeeId)) {
             return ResponseDTO.userErrorParam("手机号已存在");
-        }
+        }*/
 
         existEntity = employeeDao.getByEmail(email, null);
         if (null != existEntity && !Objects.equals(existEntity.getEmployeeId(), employeeId)) {

yun-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml

@@ -70,6 +70,7 @@
                 AND deleted_flag = #{deletedFlag}
             </if>
         </where>
+        limit 1
     </select>
 
     <select id="getByEmail" resultType="net.lab1024.sa.admin.module.system.employee.domain.entity.EmployeeEntity">
@@ -81,6 +82,7 @@
                 AND deleted_flag = #{deletedFlag}
             </if>
         </where>
+        limit 1
     </select>
 
     <select id="listAll" resultType="net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO">