sunyize 2 gadi atpakaļ
vecāks
revīzija
98aa11ce71

+ 11 - 5
tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SysCompanyController.java

@@ -114,7 +114,7 @@ public class SysCompanyController {
         }
         Map<String, String> map = data.get("data");
 
-        if (StringUtils.isNotBlank(map.get("aid"))){
+        if (StringUtils.isBlank(map.get("aid"))){
             String mes ="";
             if (StringUtils.isBlank(map.get("aname"))){
                 mes+=" 二级部门名称不可为空! ";
@@ -141,10 +141,13 @@ public class SysCompanyController {
             sysBusinessHall.setName(map.get("bname"));
             sysBusinessHall.setCompanyId(sysCompany.getId());
             sysBusinessHall.setAddress(map.get("address"));
-            sysBusinessHall.setCoordinate(map.get("coordinate"));
+            sysBusinessHall.setCoordinate(map.get("coordinate").trim());
             sysBusinessHall.setThreeCompanyId(map.get("three_company_id"));
             boolean save = sysBusinessHallService.save(sysBusinessHall);
-            return Result.OK("增加成功...");
+            if (save){
+                return Result.OK("增加成功...");
+            }
+            return Result.error("增加失败");
         }else {
             SysCompany sysCompany = new SysCompany();
             sysCompany.setName(map.get("aname"));
@@ -154,12 +157,15 @@ public class SysCompanyController {
             boolean update = sysCompanyService.update(updateWrapper);
 
             UpdateWrapper<SysBusinessHall> hallUpdateWrapper = new UpdateWrapper<>();
-            hallUpdateWrapper.eq("id",map.get("bid")).set("bname",map.get("bname")).set("address",map.get("address"))
+            hallUpdateWrapper.eq("id",map.get("bid")).set("name",map.get("bname")).set("address",map.get("address"))
                     .set("coordinate",map.get("coordinate")).set("three_company_id",map.get("three_company_id"));
 
             boolean save = sysBusinessHallService.update(hallUpdateWrapper);
-            return Result.OK("修改成功...");
+            if (save && update){
+                return Result.OK("修改成功...");
+            }
 
+            return Result.error("修改失败");
         }
 
     }