xiongchao 3 years ago
parent
commit
4b68e27405

+ 10 - 8
platform-rest/src/main/java/com/platform/rest/controller/upms/SysUserController.java

@@ -482,15 +482,17 @@ public class SysUserController {
      * @return
      */
     @RequestMapping(value = "/bind/{openId}", method = RequestMethod.GET)
-    public R bind(@PathVariable("openId") String openId) throws IOException {
+    public R bind(@PathVariable(value = "openId", required = false) String openId) throws IOException {
         log.info("微信的openId: " + openId);
-        SysUser searchUser = new SysUser();
-        searchUser.setWxOpenId(openId);
-        SysUser sysUser = sysUserService.getModelByModel(searchUser);
-        if (sysUser == null) {
-            UserInfo userInfo = SecurityUtils.getUser().getUserInfo();
-            searchUser.setUserId(userInfo.getUserId());
-            sysUserService.modModelByPrimaryKey(searchUser);
+        if(!StringUtils.isBlank(openId)){
+            SysUser searchUser = new SysUser();
+            searchUser.setWxOpenId(openId);
+            SysUser sysUser = sysUserService.getModelByModel(searchUser);
+            if (sysUser == null) {
+                UserInfo userInfo = SecurityUtils.getUser().getUserInfo();
+                searchUser.setUserId(userInfo.getUserId());
+                sysUserService.modModelByPrimaryKey(searchUser);
+            }
         }
         return R.success("微信绑定成功");
     }

+ 5 - 0
platform-service/src/main/java/com/platform/service/check/impl/CheckStandardServiceImpl.java

@@ -89,6 +89,11 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
         weekend.weekendCriteria().andEqualTo(CheckProjectStandardRelation::getStandardId, id);
         relationMapper.deleteByExample(weekend);
 
+        // 删除标准任务:所有和这个标准一样的任务
+        Weekend<CheckJob> checkJobWeekend = new Weekend<>(CheckJob.class);
+        checkJobWeekend.weekendCriteria().andEqualTo(CheckJob::getStandardId, id);
+        checkJobMapper.deleteByExample(checkJobWeekend);
+
         // 删除标准参数
         Weekend<CheckStandardParam> checkStandardParamWeekend = new Weekend<>(CheckStandardParam.class);
         checkStandardParamWeekend.weekendCriteria().andEqualTo(CheckStandardParam::getStandardId, id);