Procházet zdrojové kódy

用户测试修改

xucaiqin před 2 roky
rodič
revize
32bfcdf46c

+ 1 - 1
iot-module/iot-module-system/iot-module-system-api/src/main/java/com/middle/platform/system/api/enums/DictType.java

@@ -12,7 +12,7 @@ public interface DictType {
     String DATA_FORMAT_TYPE = "data_tormat_type";
     String AUTH_TYPE = "auth_type";//认证类型
     String SEX_TYPE = "sex_type";//性别
-    String STATUS_TYPE = "status_type";//性别
+    String STATUS_TYPE = "status_type";//状态 启用 禁用
     String MENU_TYPE = "menu_type";//菜单类别
 
 }

+ 1 - 0
iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/pojo/res/SysUserVo.java

@@ -12,6 +12,7 @@ import lombok.Setter;
 @Getter
 @Setter
 public class SysUserVo {
+    private Long id;
     /**
      * 姓名
      */

+ 1 - 1
iot-module/iot-module-system/iot-module-system-biz/src/main/java/com/middle/platform/system/biz/service/SysUserService.java

@@ -216,7 +216,7 @@ public class SysUserService {
      */
     public Object detail(Long id) {
         SysUser sysUser = sysUserMapper.selectById(id);
-        if (Objects.isNull(sysUser)) {
+        if (Objects.isNull(sysUser) || Objects.equals(sysUser.getDelFlag(), Global.DEL)) {
             throw new BusinessException("用户不存在");
         }
         SysUserVo sysUserVo = new SysUserVo();

+ 7 - 1
iot-module/iot-module-system/iot-module-system-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -26,7 +26,13 @@
   </sql>
 
   <select id="pageList" resultType="com.middle.platform.system.biz.pojo.res.SysUserVo">
-      select *
+      select su.id,
+             su.name,
+             su.sex,
+             su.phone,
+             su.username,
+             su.status,
+             su.remark
       from sys_user su
       <where>
           <if test="name != null and name != ''">