4月7日bug调试修改

src/main/java/com/om/controller/admin/EmployeeController.java

@@ -76,10 +76,8 @@ public class EmployeeController {
             return Result.fail("账号不存在，请先注册");
         } else if (!employee.getPassword().equals(DigestUtils.md5Hex(loginDto.getPassword() + Constants.SALT))) {
             return Result.fail("账号或密码不正确");
-        } else if (employee.getStatus().equals(0)) {
-            return Result.fail("账号未审批，请联系管理员");
-        } else if (employee.getStatus().equals(2)) {
-            return Result.fail("账号审批未通过，请联系管理员");
+        } else if (employee.getStatus().equals(1)) {
+            return Result.fail("账号未启用");
         }
         copyObject(loginDto, employee, redisTemplate, menuService);
 
@@ -234,7 +232,7 @@ public class EmployeeController {
     @ApiOperation("增加员工接口")
     @PostMapping("/save")
     public Result save(@RequestBody Employee employee) {
-        employee.setPassword(DigestUtils.md5Hex(111111 + Constants.SALT));
+        employee.setPassword(DigestUtils.md5Hex(employee.getPassword()+Constants.SALT));
         return Result.succ(employeeService.save(employee));
     }
 

src/main/java/com/om/entity/dto/UpdatePassDTO.java

@@ -6,6 +6,10 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
+
+
+
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/om/service/impl/UserServiceImpl.java

@@ -163,7 +163,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
                 vciInfoVOList.add(vciInfoVO);
             }
-            if (defaultCount!=1){
+            if (defaultCount>1){
                 return Result.fail("设备已是默认状态").result(ResultCode.VCI_DEFAULTED);
             }
 

src/main/resources/mapper/EmployeeMapper.xml

@@ -37,10 +37,9 @@
     </select>
 
     <select id="findEmployee" resultType="com.om.entity.po.Employee">
-        select e.*,d.*
-        from employee as e,department as d
-        where e.departmentid = d.departmentid
-        and e.is_delete = 0
+        select *
+        from employee as e
+        where e.is_delete = 0
         <if test="employeename != null and employeename != ''">
             and e.employeename like concat('%',#{employeename},'%')
         </if>
@@ -50,9 +49,6 @@
         <if test="email != null and email != ''">
             and e.email like concat('%',#{email},'%')
         </if>
-        <if test="departmentname != null and departmentname != ''">
-            and d.departmentname like concat('%',#{departmentname},'%')
-        </if>
     </select>
 
     <select id="getByStatus" resultType="com.om.entity.po.Employee">