From 5493c2095516a212b6b6d72914077b795e566f83 Mon Sep 17 00:00:00 2001 From: shiyang Date: Sat, 25 Sep 2021 16:05:37 +0800 Subject: [PATCH] =?UTF-8?q?PC-=E6=9F=A5=E8=AF=A2=E5=90=8C=E4=B8=80?= =?UTF-8?q?=E5=AE=B6=E5=8C=BB=E9=99=A2=E7=A7=91=E5=AE=A4=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=87=8D=E5=A4=8D=EF=BC=88=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=89=20PC-=E6=9F=A5=E8=AF=A2=E5=90=8Cvtype=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E5=AD=97=E5=85=B8=E7=BC=96=E7=A0=81=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E9=87=8D=E5=A4=8D=EF=BC=88=E4=BF=AE=E6=94=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../talkonlineweb/controller/DepartController.java | 14 ++++++++++--- .../controller/RegionsController.java | 24 ++++++++++++++-------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java index 51f2386..632075d 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java @@ -200,14 +200,22 @@ public class DepartController { * @return true 可以使用，false已经存在 */ @GetMapping("getDepartByParam") - public BaseResponse getDepartByParam(Integer hid,String dname){ + public BaseResponse getDepartByParam(Integer hid,String dname,@RequestParam(required = false) Integer did){ BaseResponse baseResponse=new BaseResponse(); try { QueryWrapper queryWrapper=new QueryWrapper<>(); queryWrapper.eq("hid", hid); queryWrapper.eq("dname", dname); - LymsHdepart lymsHdepart=lymsHdepartService.getOne(queryWrapper); - baseResponse.setObject(null==lymsHdepart?true:false); + if(null!=did){//修改的时候判断是否重复 + QueryWrapper queryWrapper2=new QueryWrapper<>(); + queryWrapper2.eq("did", did); + LymsHdepart lymsHdepart2=lymsHdepartService.getOne(queryWrapper2); + LymsHdepart lymsHdepart=lymsHdepartService.getOne(queryWrapper); + baseResponse.setObject(null==lymsHdepart?true:(lymsHdepart2.getDname().equals(dname)?true:false)); + }else { + LymsHdepart lymsHdepart=lymsHdepartService.getOne(queryWrapper); + baseResponse.setObject(null==lymsHdepart?true:false); + } baseResponse.setErrormsg("成功"); } catch (Exception e) { baseResponse.setErrormsg("失败"); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RegionsController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RegionsController.java index af57bc1..f59a223 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RegionsController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RegionsController.java @@ -11,10 +11,7 @@ import com.lyms.talkonlineweb.result.BaseResponse; import com.lyms.talkonlineweb.service.LymsDictService; import com.lyms.talkonlineweb.service.RegionsService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -95,20 +92,29 @@ public class RegionsController { } /** - * PC-查询同vtype类型字code典编码是否重复 + * PC-查询同vtype类型，字典编码是否重复 * @param vtype 所属类型 * @param code 编码 + * @param value 取值 * @return true 可以使用，false已经存在 */ @GetMapping("getDictByParam") - public BaseResponse getDictByParam(Integer vtype,Integer code){ + public BaseResponse getDictByParam(Integer vtype, Integer code,String value, @RequestParam(required = false) Integer id){ BaseResponse baseResponse=new BaseResponse(); try { QueryWrapper queryWrapper=new QueryWrapper<>(); queryWrapper.eq("vtype", vtype); - queryWrapper.eq("code", code); - LymsDict dict=lymsDictService.getOne(queryWrapper); - baseResponse.setObject(null==dict?true:false); + queryWrapper.eq("code", code).or().eq("value",value ); + if(null!=id){//修改的时候判断是否重复 + QueryWrapper queryWrapper2=new QueryWrapper<>(); + queryWrapper2.eq("id", id); + LymsDict dict2=lymsDictService.getOne(queryWrapper2); + LymsDict dict=lymsDictService.getOne(queryWrapper); + baseResponse.setObject(null==dict?true:(dict2.getCode().equals(code)&&dict2.getValue().equals(value)?true:false)); + }else { + LymsDict dict=lymsDictService.getOne(queryWrapper); + baseResponse.setObject(null==dict?true:false); + } baseResponse.setErrormsg("成功"); } catch (Exception e) { baseResponse.setErrormsg("失败"); -- 1.8.3.1