1

staffing-admin/src/main/java/com/staffing/web/controller/employee/EmployeeTaskController.java

@@ -44,7 +44,7 @@ public class EmployeeTaskController extends BaseController
      * 查询任务列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(StTask stTask, @RequestParam(required = false) boolean self, @RequestParam(required = false) boolean xinchou)
+    public TableDataInfo list(StTask stTask, @RequestParam(required = false) boolean xinchou)
     {
 
         if (!xinchou){
@@ -62,18 +62,59 @@ public class EmployeeTaskController extends BaseController
         if (stTask.getDateStatus() != 0){
             stTask.setTaskDateCompare(dayZero);
         }
-        SysUser user = SecurityUtils.getLoginUser().getUser();
+        SysUser user = null;
-        long userId = user.getUserId();
+        try{
+            user = SecurityUtils.getLoginUser().getUser();
+        }catch (Exception e){
+        }
+
+        long userId = 0;
+        if (user != null){
+            userId = user.getUserId();
+        }
         List<StTask> list;
         stTask.getParams().put("order", dayZero);
-        if (!self){
         list = stTaskService.selectStTaskList(stTask, userId);
-        }else{
-            stTask.setDateStatus(0);
-            list = stTaskService.selectStTaskListByUserId(stTask, userId, xinchou);
-        }
         return getDataTable(list);
     }
+    /**
+     * 查询任务列表
+     */
+    @GetMapping("/selfList")
+    public TableDataInfo selfList(StTask stTask, @RequestParam(required = false) boolean xinchou)
+    {
+        if (!xinchou){
+            stTask.setDateStatus(1);
+        }else{
+            stTask.setDateStatus(0);
+        }
+        stTask.setStatus(1);
+        // 获取当前时间
+        ZonedDateTime now = ZonedDateTime.now();
+        // 今日0点
+        ZonedDateTime nextDayStart = now.plusDays(0).truncatedTo(ChronoUnit.DAYS);
+        Date dayZero = Date.from(nextDayStart.toInstant());
+
+        if (stTask.getDateStatus() != 0){
+            stTask.setTaskDateCompare(dayZero);
+        }
+        SysUser user = null;
+        try{
+            user = SecurityUtils.getLoginUser().getUser();
+        }catch (Exception e){
+        }
+
+        long userId = 0;
+        if (user != null){
+            userId = user.getUserId();
+        }
+        List<StTask> list;
+        stTask.getParams().put("order", dayZero);
+        stTask.setDateStatus(0);
+        list = stTaskService.selectStTaskListByUserId(stTask, userId, xinchou);
+        return getDataTable(list);
+    }
+
 
 
 

staffing-admin/src/main/java/com/staffing/web/controller/merchant/MerchantUserController.java

@@ -207,5 +207,10 @@ public class MerchantUserController extends BaseController
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }
-
+    @GetMapping("verifyToken")
+    public AjaxResult verifyToken()
+    {
+        AjaxResult ajax = AjaxResult.success();
+        return ajax;
+    }
 }

staffing-framework/src/main/java/com/staffing/framework/config/SecurityConfig.java

@@ -112,7 +112,7 @@ public class SecurityConfig
                 permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问  , "/employee/**/**", "/employee/**", "/merchant/**/**", "/merchant/**"
                 requests.antMatchers("/login", "/register", "/captchaImage"
-                        , "/employee/task/getTask"
+                        , "/employee/task/getTask" , "/employee/task/list"
                         , "/employee/user/login", "/employee/user/wxlogin", "/employee/user/register", "/employee/user/captchaImage"
                         , "/merchant/user/login", "/merchant/user/wxlogin", "/merchant/user/register", "/merchant/user/captchaImage"
                         , "/merchant/fund/fxResult").permitAll()

staffing-system/src/main/java/com/staffing/custom/service/impl/StTaskServiceImpl.java

@@ -132,7 +132,7 @@ public class StTaskServiceImpl implements IStTaskService
         for (StTask task : stTasks) {
             if (task.getCodePic() == null){
                 generatePrCode(task);
-                updateStTask(stTask);
+                updateStTask(task);
             }
         }
 

staffing-ui/README.md

@@ -24,7 +24,7 @@ npm run dev
 ```bash
 # 构建测试环境
 npm run build:stage
-
+4
 # 构建生产环境
 npm run build:prod
 ```

staffing-ui/src/components/Breadcrumb/index.vue

@@ -35,7 +35,7 @@ export default {
       const first = matched[0]
 
       if (!this.isDashboard(first)) {
-        matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched)
+        matched = [{ path: '/index', meta: { title: '' }}].concat(matched)
       }
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)