Merge remote-tracking branch 'origin/saff_update_feature' into saff_update_feature

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppShareholderDetailBiz.java

@@ -45,12 +45,12 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
     public static int BRANCH_HEADQUARTERS_SHAREHOLDER = 2;
 
     public Integer findShareholderByUserIdOrPhone(Integer userId, String phone) {
-        return  mapper.selectShareHolderByUserIdOrPhone(userId,phone);
+        return mapper.selectShareHolderByUserIdOrPhone(userId, phone);
     }
 
     /**
      * 新增股东
-     *
+     * zuoyh
      * @param appShareholderDetailDTO
      * @param updUserId
      * @return
@@ -87,12 +87,17 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
                     }
                 }
             }
-            Integer id = appShareholderDetailDTO.getId()==null?0:appShareholderDetailDTO.getId();
-            //插入
+            Integer id = appShareholderDetailDTO.getId() == null ? 0 : appShareholderDetailDTO.getId();
             BeanUtils.copyProperties(appShareholderDetailDTO, appShareholderDetail);
             appShareholderDetail.setPositionId(positionId);
-            insertSelective(appShareholderDetail);
-
+            appShareholderDetailDTO.setUserId(userId);
+            //插入
+            if (id == null || id == 0) {
+                insertSelective(appShareholderDetail);
+                //編輯
+            } else {
+                updateSelectiveById(appShareholderDetail);
+            }
         }
         return ObjectRestResponse.succ();
     }
@@ -146,5 +151,13 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
         return dataVO;
     }
 
+    /**
+     * 批量导入
+     */
+
+
+
+
+
 
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -112,7 +112,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
             updateSelectiveById(userPositionTemp);
         }
         if (userId != 0) {
-             //更改用户身份信息
+            //更改用户身份信息
             detailBiz.updateUserPositionByUserId(userId, appUserPositionTempDTO.getPositionId());
         }
         return ObjectRestResponse.succ();
@@ -324,7 +324,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                 return;
             }
             Integer postionId = appShareholderDetailBiz.findShareholderByUserIdOrPhone(null, phone);
-            if(Objects.isNull(postionId)) {
+            if (Objects.isNull(postionId)) {
                 Example example = new Example(AppUserPositionTemp.class);
                 example.createCriteria().andEqualTo("phone", phone).andEqualTo("isDel", 0);
                 List<AppUserPositionTemp> list = selectByExample(example);
@@ -344,8 +344,8 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                     log.info("----用户---postionId====" + postionId + "----phone===" + phone);
                     detailBiz.updateUserPositionByUserId(userId, postionId);
                 }
-            }else {
-                detailBiz.updateUserPositionByUserId(userId,postionId);
+            } else {
+                detailBiz.updateUserPositionByUserId(userId, postionId);
             }
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -460,7 +460,6 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         return ObjectRestResponse.succ();
     }
 
-
     /**
      * 查询员工信息变更记录表
      */