常用标签维护——删除，逻辑修改

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

@@ -93,18 +93,27 @@ 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())){
+        Boolean flag = false;
+        for (QuestionUsual questionUsual:questionUsualList) {
+            if(questionUsual.getIsDeleted().equals(IsDeleteEnum.N.getKey())){
+                flag = true;
+                break;
+            }
+        }
+        if(!flag){
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "标签已删除");
         }
-        String userId = UserUtils.getCurrentPrincipleID();
+        //删除常用标签
+        /*String userId = UserUtils.getCurrentPrincipleID();*/
         UpdateWrapper<QuestionUsual> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("dept_id", deleteQuestionUsualVO.getDeptId())
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
-                .set("modifier", userId)
+                .set("modifier", "1"/*userId*/)
                 .set("gmt_modified", DateUtil.now());
         this.update(new QuestionUsual(), updateWrapper);
         return true;