Parcourir la source

修改 代码提交错误

guoenzhou il y a 2 ans
Parent
commit
bde24d647e

+ 3 - 0
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysOperlogController.java

@@ -2,6 +2,8 @@ package com.usky.system.controller.web;
 
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.system.controller.web.page.TableDataInfo;
 import com.usky.system.domain.SysOperLog;
 import com.usky.system.service.ISysOperLogService;
@@ -32,6 +34,7 @@ public class SysOperlogController extends BaseController
 
 
     @DeleteMapping("/{operIds}")
+    @Log(title = "操作日志", businessType = BusinessType.DELETE)
     public ApiResult<Void> remove(@PathVariable Long[] operIds)
     {
         return toAjax(operLogService.deleteOperLogByIds(operIds));

+ 0 - 36
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TestController.java

@@ -1,36 +0,0 @@
-package com.usky.demo.controller.web;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.demo.domain.SysUser;
-import com.usky.demo.mapper.SysUserMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 事件管理-火警告警处置
- *
- * @author JCB
- * @since 2022-07-29
- */
-@RestController
-@RequestMapping("/test")
-public class TestController {
-
-    @Autowired
-    private SysUserMapper sysUserMapper;
-
-
-    @GetMapping("select")
-    public ApiResult<SysUser> select() {
-        SysUser sysUser = sysUserMapper.selectUserByIdOne(1L);
-        return ApiResult.success(sysUser);
-    }
-
-
-
-}
-

+ 1 - 1
base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/SysLoginService.java

@@ -60,7 +60,7 @@ public class SysLoginService
 
         // 查询用户信息
         LoginUser loginUser = new LoginUser();
-        if (tenantId!=null&&tenantId!=0){
+        if (tenantId!=null&&tenantId!=0) {
             loginUser = sysUserService.getUserInfoOne(username,tenantId);
         }else {
             loginUser = sysUserService.getUserInfo(username);