From 715a2691d88ffbe5f5be9e5403c166f923088fcc Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 26 七月 2024 17:15:57 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

---
 server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
index a556d35..a1c246c 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
@@ -100,6 +100,11 @@
     @Override
     public void updateById(Shop shop) {
         shopMapper.updateById(shop);
+        usersMapper.update(new UpdateWrapper<Users>().lambda()
+                .set(Users::getCardImg,null)
+                .isNotNull(Users::getCardImg)
+                .eq(Users::getDepartmentId,shop.getId())
+        );
     }
 
     @Override
@@ -359,6 +364,8 @@
                 shop.setLegalPhone(model.getLegalPhone());
                 shop.setLegalIdcode(model.getLegalIdcode());
                 shop.setLegalName(model.getLegalName());
+                shop.setFcode(model.getFcode());
+                shop.setScode(model.getScode());
                 shop.setTaxRegCode(model.getTaxRegCode());
                 shopMapper.updateById(shop);
             }
@@ -737,6 +744,7 @@
             shop.setSecondType(model.getSecondType());
             shop.setAttribute(model.getAttribute());
             shop.setParentIamId(model.getParentOrgId());
+            shop.setScode(model.getScode());
             newList.add(shop);
         }else {
             shop.setEditor(loginUserInfo.getId());
@@ -745,6 +753,7 @@
             shop.setSecondType(model.getSecondType());
             shop.setName(model.getName());
             shop.setCode(model.getCode());
+            shop.setScode(model.getScode());
             shop.setUnitCode(model.getUnitCode());
             if(Constants.equalsInteger(model.getStatus(),Constants.TWO)){
                 shop.setIsdeleted(Constants.ONE);
@@ -1016,6 +1025,11 @@
         Shop updShop = new Shop();
         BeanUtils.copyProperties(editShopDTO,updShop);
         shopMapper.updateById(updShop);
+        usersMapper.update(new UpdateWrapper<Users>().lambda()
+                .set(Users::getCardImg,null)
+                .isNotNull(Users::getCardImg)
+                .eq(Users::getDepartmentId,shop.getId())
+        );
     }
 
 }

--
Gitblit v1.9.3