Browse Source

常用标签维护——删除,逻辑补充

wangyu 6 years ago
parent
commit
e246d52990

+ 10 - 3
icssman-service/src/main/java/com/diagbot/facade/QuestionUsualFacade.java

@@ -93,13 +93,20 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      * @return
      */
     public Boolean deleteQuestionUsualByDeptId(DeleteQuestionUsualVO deleteQuestionUsualVO) {
+        QueryWrapper<QuestionUsual> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("dept_id",deleteQuestionUsualVO.getDeptId());
+        List<QuestionUsual> questionUsualList = this.list(queryWrapper);
+        if(!questionUsualList.contains(IsDeleteEnum.N.getKey())){
+            throw new CommonException(CommonErrorCode.RPC_ERROR,
+                    "标签已删除");
+        }
         String userId = UserUtils.getCurrentPrincipleID();
-        UpdateWrapper<QuestionUsual> queryWrapper = new UpdateWrapper<>();
-        queryWrapper.eq("dept_id", deleteQuestionUsualVO.getDeptId())
+        UpdateWrapper<QuestionUsual> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("dept_id", deleteQuestionUsualVO.getDeptId())
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
                 .set("modifier", userId)
                 .set("gmt_modified", DateUtil.now());
-        this.update(new QuestionUsual(), queryWrapper);
+        this.update(new QuestionUsual(), updateWrapper);
         return true;
     }