Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/UserMapper.java

@@ -18,4 +18,6 @@ import java.util.List;
 public interface UserMapper extends BaseMapper<User> {
 
     List<UserVO> selectListByCondition(@Param("roleType") Integer roleType, @Param("companyId")Integer companyId,@Param("flag") Integer flag, @Param("user") User user, @Param("keyName") String keyName);
+
+    UserVO getUserByAccount(@Param("userVO") UserVO userVO);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/UserServiceImpl.java

@@ -52,16 +52,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         Integer count = userMapper.selectCount(qw);
         //验证用户名是否正确
         if (count > 0) {
-            User newUser = userMapper.selectOne(qw);
+            UserVO newUser = userMapper.getUserByAccount(userVO);
             //验证密码是否正确
             if (MD5Util.getPassword(userVO.getPassword()).equals(newUser.getPassword())) {
                 newUser.setPassword("");
-                BeanUtils.copyProperties(newUser, userVO);
                 //判断该用户是否为某个项目的项目经理
                 if (projectMapper.selectCount(new QueryWrapper<Project>().eq("manager_id", newUser.getId())) > 0) {
-                    userVO.setIsManager(1);
+                    newUser.setIsManager(1);
                 }
-                msg.data = userVO;
+                msg.data = newUser;
             } else {
                 msg.setError("密码错误");
             }

cloud-model/src/main/resources/mapper/UserMapper.xml

@@ -74,4 +74,16 @@
         </where>
         Order by u.id desc
     </select>
+    <select id="getUserByAccount" resultMap="BaseResultMapVO">
+        select
+          u.id id, u.account account, u.username username, u.password password, u.mobile mobile, u.role_type role_type, u.company_id company_id, c.`company_name` company_name,
+          u.role_name role_name,u.parent_id parent_id, u.sex sex, u.work_state work_state, u.is_disable is_disable,
+          u.indate indate, u.head_imgurl head_imgurl, u.team_name team_name, u.subordinate_type subordinate_type
+        from
+          tb_user AS u
+        LEFT JOIN tb_company c
+        ON u.company_id = c.`id`
+        where
+          u.account = #{userVO.account}
+    </select>
 </mapper>