Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/mapper/TUserMapper.java

@@ -2,6 +2,7 @@ package cn.wisenergy.chnmuseum.party.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.wisenergy.chnmuseum.party.model.TUser;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,7 +18,7 @@ public interface TUserMapper extends BaseMapper<TUser> {
 
     TUser selectByUsername(String userName);
 
-    List<TUser> selectList(String userName);
+    List<TUser> getList(String userName);
 
     TUser getById(String id);
 }

src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java

@@ -75,7 +75,6 @@ public class TUser implements Serializable {
     
     @ApiModelProperty("所属机构ID")
     @TableField("org_id")
-        @NotBlank(message = "所属机构ID不能为空", groups = {Add.class, Update.class})
         private String orgId;
     
     @ApiModelProperty("是否永久用户")

src/main/java/cn/wisenergy/chnmuseum/party/service/TUserService.java

@@ -4,6 +4,8 @@ import cn.wisenergy.chnmuseum.party.model.TUser;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户 服务接口
@@ -16,7 +18,7 @@ public interface TUserService extends IService<TUser> {
 
     TUser selectByUsername(String userName);
 
-    Page<TUser> selectList(Page<TUser> page, String userName);
+    Page<TUser> getList(Page<TUser> page, String userName);
 
     TUser selectById(String id);
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TUserServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.Resource;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * <pre>
@@ -39,8 +40,8 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
     }
 
     @Override
-    public Page<TUser> selectList(Page<TUser> page, String userName) {
-        return page.setRecords(tUserMapper.selectList(userName));
+    public Page<TUser> getList(Page<TUser> page, String userName) {
+        return page.setRecords(tUserMapper.getList(userName));
     }
 
     @Override
@@ -52,4 +53,5 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
         }
         return user;
     }
+
 }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/SysLogController.java

@@ -96,7 +96,7 @@ public class SysLogController extends BaseController {
     })
     @GetMapping(value = "/querySysLogList")
     @RequiresPermissions("/sysLog/querySysLogList")
-    public ResponseEntity<Page<SysLog>> querySysLogList(GenericPageParam genericPageParam) {
+    public Map<String, Object> querySysLogList(GenericPageParam genericPageParam) {
         try {
             LambdaQueryWrapper<SysLog> queryWrapper = new LambdaQueryWrapper<>();
             // 对名称或编码模糊查询
@@ -117,11 +117,11 @@ public class SysLogController extends BaseController {
             // 设置排序规则
             queryWrapper.orderByDesc(SysLog::getOperationTime);
             Page<SysLog> page = sysLogService.page(getPage(), queryWrapper);
-            return ResponseEntity.ok(page);
+            return getResult(page);
         } catch (Exception e) {
             logger.error("查询系统日志列表出错!", e);
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+        return getFailResult();
     }
 
     /**
@@ -158,14 +158,14 @@ public class SysLogController extends BaseController {
     })
     @GetMapping(value = "/OperationLog")
     @RequiresPermissions("/sysLog/OperationLog")
-    public ResponseEntity<Page<TOperationLog>> OperationLog(TOperationLog operationLog) {
+    public Map<String, Object> OperationLog(TOperationLog operationLog) {
         try {
             Page<TOperationLog> page = operationLogService.pageList(getPage(), operationLog);
-            return ResponseEntity.ok(page);
+            return getResult(page);
         } catch (Exception e) {
             logger.error("查询系统日志列表出错!", e);
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+        return getFailResult();
     }
 
     /**
@@ -181,14 +181,14 @@ public class SysLogController extends BaseController {
     })
     @GetMapping(value = "/runLogList")
     @RequiresPermissions("/sysLog/runLogList")
-    public ResponseEntity<Page<RunLog>> runLogList(RunLog runLog) {
+    public Map<String, Object> runLogList(RunLog runLog) {
         try {
             Page<RunLog> page = runLogService.pageList(getPage(), runLog);
-            return ResponseEntity.ok(page);
+            return getResult(page);
         } catch (Exception e) {
             logger.error("查询系统日志列表出错!", e);
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+        return getFailResult();
     }
 
 

src/main/resources/mapper/TUserMapper.xml

@@ -65,14 +65,16 @@
         where u.id =#{id}
     </select>
 
-    <select id="selectList" resultMap="BaseResultMap">
+    <select id="getList" resultMap="BaseResultMap">
         select u.*,o.name org_name,a.full_name area_name
         from t_user u
         left join t_organ o on o.id = u.org_id
         left join t_area a on u.area_id = a.id
-        <if test=" username != null and username != '' ">
+        <if test=" userName != null and userName != '' ">
             where u.user_name LIKE concat('%', #{userName}, '%')
         </if>
+        and u.is_deleted = false
+        order by u.create_time desc
     </select>
 
     <select id="selectRoles" resultMap="roleMap">
@@ -81,7 +83,7 @@
         left join t_organ o on o.id = u.org_id
         left join t_user_role_link l on l.user_id = u.id
         left join t_role r on l.role_id = r.id
-        <if test=" username != null and username != '' ">
+        <if test=" userName != null and userName != '' ">
             where u.user_name =#{userName}
         </if>
     </select>