mapper参数注解

wisenergy-mapper/src/main/resources/mapper/WorkProjectMapper.xml

@@ -9,7 +9,6 @@
         <result column="project_name" property="projectName" />
         <result column="type" property="type" />
         <result column="manager_id" property="managerId" />
-        <result column="manager_name" property="managerName" />
         <result column="dept_id" property="deptId" />
         <result column="work_time" property="workTime" />
         <result column="cost_budget" property="costBudget" />
@@ -22,7 +21,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, oa_project_id, project_name, type, manager_id, manager_name, dept_id, work_time, cost_budget, is_conclusion,start_time,end_time, create_time, modify_time
+        id, oa_project_id, project_name, type, manager_id, dept_id, work_time, cost_budget, is_conclusion,start_time,end_time, create_time, modify_time
     </sql>
 
     <sql id="table">
@@ -35,7 +34,6 @@
         <if test="projectName != null">and project_name = #{projectName}</if>
         <if test="type != null">and type =#{type}</if>
         <if test="managerId != null">and manager_id = #{managerId}</if>
-        <if test="managerName != null">and manager_name = #{managerName}</if>
         <if test="dept_id != null">and dept_id = #{dept_id}</if>
         <if test="workTime != null">and work_time =#{workTime}</if>
         <if test="costBudget != null">and cost_budget = #{costBudget}</if>

wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkProject.java

@@ -42,9 +42,6 @@ public class WorkProject implements Serializable {
     @ApiModelProperty(name = "managerId",value = "项目经理userId")
     private Integer managerId;
 
-    @ApiModelProperty(name = "managerName",value = "项目经理姓名")
-    private String managerName;
-
     @ApiModelProperty(name = "deptId",value = "部门id")
     private Integer deptId;
 

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java

@@ -75,7 +75,8 @@ public class WorkUserServiceImpl implements WorkUserService {
         //根据主键和密码查找
         Map<String, Object> map = new HashMap<>();
         map.put("id", userId);
-        map.put("password", Md5Util.digestMD5(oldPassword));
+      map.put("password", Md5Util.digestMD5(oldPassword));
+        map.put("password", oldPassword);
         WorkUser user = workUserMapper.getUserInfo(map);
         if (user == null) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.UPDATE_PASSWORD_FAIL_OLD_PASSWORD_ERROR);
@@ -96,11 +97,11 @@ public class WorkUserServiceImpl implements WorkUserService {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
         //MD5加密
-       /* String md5Password = Md5Util.digestMD5(password);*/
+        String md5Password = Md5Util.digestMD5(password);
 
         HashMap<String, Object> map = new HashMap<>();
         map.put("loginName", loginName);
-        map.put("password", password);
+        map.put("password", md5Password);
         WorkUser user = workUserMapper.getUserInfo(map);
         if (null == user) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.USER_LOGIN_NAME_OR_PASSWORD_IS_ERROR);