sunruiqi пре 2 година
родитељ
комит
a01f66a215

+ 6 - 2
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/knowledge/controller/TypeController.java

@@ -44,8 +44,12 @@ public class TypeController {
     @ApiOperation(value = "新增/修改")
     @PostMapping("/save")
     public ResponseEntity<String> save(@RequestBody KnowledgeShareType type) {
-        String s = service.save(type);
-        return ResponseEntity.ok(s);
+        Boolean b = service.save(type);
+        if (b) {
+            return ResponseEntity.ok("操作成功");
+        } else {
+            return ResponseEntity.badRequest().body("该类型已存在,请重新输入");
+        }
     }
 
     /**

+ 1 - 1
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/knowledge/mapper/KnowledgeShareTypeMapper.java

@@ -13,6 +13,6 @@ public interface KnowledgeShareTypeMapper extends BaseMapper<KnowledgeShareType>
 
     IPage<KnowledgeShareTypeDto> findList(Page<KnowledgeShareTypeDto> page, @Param("type") String type);
 
-    List<KnowledgeShareType> checkList(@Param("type")String type, @Param("key")String key);
+    List<KnowledgeShareType> checkList(@Param("type")KnowledgeShareType type);
 
 }

+ 5 - 1
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/knowledge/mapper/xml/KnowledgeShareTypeMapper.xml

@@ -40,7 +40,11 @@
 			knowledge_share_type
 		WHERE
 			del_flag =0
-			AND (klgs_key = #{key} OR klgs_type = #{type})
+			AND klgs_key = #{type.klgsKey}
+			AND klgs_type = #{type.klgsType}
+			<if test="type.id != null and type.id != ''">
+				AND id != #{type.id}
+			</if>
 	</select>
 
 </mapper>

+ 7 - 7
jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/knowledge/service/TypeService.java

@@ -28,10 +28,10 @@ public class TypeService {
         return mapper.findList(page, type.getKlgsType());
     }
 
-    public String save(KnowledgeShareType type) {
-        List<KnowledgeShareType> list = mapper.checkList(type.getKlgsType(), type.getKlgsKey());
+    public Boolean save(KnowledgeShareType type) {
+        List<KnowledgeShareType> list = mapper.checkList(type);
         if (CollectionUtils.isNotEmpty(list)) {
-            return "已存在同名类型,请重新输入";
+            return false;
         }
         if (StringUtils.isNotEmpty(type.getId())) {
             return update(type);
@@ -40,16 +40,16 @@ public class TypeService {
         }
     }
 
-    public String update(KnowledgeShareType type) {
+    public Boolean update(KnowledgeShareType type) {
         // 获取当前登录人
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         type.setUpdateBy(userDTO.getId());
         type.setUpdateDate(new Date());
         mapper.updateById(type);
-        return "操作完成";
+        return true;
     }
 
-    public String add(KnowledgeShareType type) {
+    public Boolean add(KnowledgeShareType type) {
         // 获取当前登录人
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
         // 生成id
@@ -61,7 +61,7 @@ public class TypeService {
         type.setUpdateDate(new Date());
         type.setDelFlag(0);
         mapper.insert(type);
-        return "操作完成";
+        return true;
     }
 
 }