1

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -126,6 +126,8 @@ public enum ResultCode  {
     CASE_FUSION_ERROR(60044, "您没有权限，请联系管理员开通。"),
     CASE_FUSION_ERROR2(60045, "此用户无当前案件内场景的访问权限，请联系管理员开通"),
 
+    CASE_NOT_EXIST2(60046, "案件或K号不存在"),
+
     ;
 
     private Integer code;

src/main/java/com/fdkankan/manage/controller/CaseFusionController.java

@@ -161,6 +161,8 @@ public class CaseFusionController extends BaseController{
         param.setSysUserId(jyUser.getSysUserId());
         param.setPlatformId(jyUser.getPlatformId());
         caseFusionService.move(param);
+        jySceneAuthService.delByNumList(Arrays.asList(param.getFusionId().toString()),"fusion");
+
         return ResultData.ok();
     }
 

src/main/java/com/fdkankan/manage/controller/inner/InnerAPIController.java

@@ -502,7 +502,7 @@ public class InnerAPIController extends BaseController {
 
     @PostMapping("/getTokenByKno")
     public ResultData getTokenByKno(@RequestBody ManageLoginRequest param){
-        if(StringUtils.isBlank(param.getKno()) || StringUtils.isBlank(param.getCaseId())){
+        if(StringUtils.isBlank(param.getKno()) &&  StringUtils.isBlank(param.getCaseId())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         Case caseEntity ;
@@ -511,6 +511,9 @@ public class InnerAPIController extends BaseController {
         }else {
             caseEntity = caseService.getByKno(param.getKno());
         }
+        if(caseEntity == null){
+            throw new BusinessException(ResultCode.CASE_NOT_EXIST2);
+        }
         Long sysUserId = caseEntity.getSysUserId();
         JyUser jyUser = jyUserService.getBySysId(sysUserId);