Commit 03864ae46feddc15103143d05d8a22377e616f2f

Authored by 648540858
1 parent 4765f9b9

修复用户查询sql错误

src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
@@ -56,7 +56,7 @@ public interface UserMapper { @@ -56,7 +56,7 @@ public interface UserMapper {
56 @Select("select * from user where md5(pushKey) = '${sign}'") 56 @Select("select * from user where md5(pushKey) = '${sign}'")
57 List<User> checkPushAuthorityByCallId(String sign); 57 List<User> checkPushAuthorityByCallId(String sign);
58 58
59 - @Select("select u.idu.username,u.pushKey,u.roleId, r.id as roleID, r.name as roleName, r.authority as roleAuthority , r.createTime as roleCreateTime , r.updateTime as roleUpdateTime FROM user u join user_role r on u.roleId=r.id") 59 + @Select("select u.id, u.username,u.pushKey,u.roleId, r.id as roleID, r.name as roleName, r.authority as roleAuthority , r.createTime as roleCreateTime , r.updateTime as roleUpdateTime FROM user u join user_role r on u.roleId=r.id")
60 @ResultMap(value="roleMap") 60 @ResultMap(value="roleMap")
61 List<User> getUsers(); 61 List<User> getUsers();
62 62
web_src/src/components/dialog/platformEdit.vue
@@ -201,7 +201,7 @@ export default { @@ -201,7 +201,7 @@ export default {
201 that.platform.devicePort = res.data.devicePort; 201 that.platform.devicePort = res.data.devicePort;
202 that.platform.username = res.data.username; 202 that.platform.username = res.data.username;
203 that.platform.password = res.data.password; 203 that.platform.password = res.data.password;
204 - that.platform.treeType = res.data.treeType; 204 + that.platform.treeType = "BusinessGroup";
205 that.platform.administrativeDivision = res.data.username.substr(0, 6); 205 that.platform.administrativeDivision = res.data.username.substr(0, 6);
206 }).catch(function (error) { 206 }).catch(function (error) {
207 console.log(error); 207 console.log(error);