调整和捷顺 对接的员工的增删改导入功能

src/main/java/org/rcisoft/integration/jieLink/service/impl/JieLinkServiceImpl.java

@@ -623,7 +623,7 @@ public class JieLinkServiceImpl implements IJieLinkService {
         JieLinkPersonDto pushData = new JieLinkPersonDto();
         pushData.setPersonNo(userData.getUsername());//人员编号
         pushData.setPersonName(userData.getName());//姓名 必填
-        pushData.setPersonGender(StringUtils.equals("0", userData.getSex()) ? 1 : StringUtils.equals("1", userData.getSex()) ? 0 : null);//性别
+        pushData.setPersonGender(StringUtils.equals("0", userData.getSex()) ? 0 : StringUtils.equals("1", userData.getSex()) ? 1 : null);//性别
         //此处需要将头像信息转换成BASE64数据存储
         if (StringUtils.isNotBlank(userData.getFaceAddress())) {
             //读取文件将文件转换为base64字符串
@@ -1230,4 +1230,4 @@ public class JieLinkServiceImpl implements IJieLinkService {
     }
 
 
-}
+}
\ No newline at end of file

src/main/java/org/rcisoft/sys/sysuser/entity/SysUser.java

@@ -149,7 +149,7 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
     private String phone;
 
     /**
-     * @desc 用户性别（0男 1女 2未知）
+     * @desc 用户性别（0女 1男）
      * @column sex
      * @default
      * @default

src/main/java/org/rcisoft/sys/sysuser/service/impl/SysUserServiceImpl.java

@@ -39,12 +39,15 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.rcisoft.core.model.CyPageInfo;
+
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.stream.Collectors;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -168,6 +171,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
     @Override
     public CyPersistModel remove(SysUser sysUser) {
         int line = sysUserRepositorys.delSysUser(Long.valueOf(sysUser.getBusinessId()));
+        if (synchronization) {
+            if (!jieLinkService.pushDelUserData(sysUser)) {
+                try {
+                    throw new CyServiceException(500, "删除员工失败，请稍后重试");
+                } finally {
+                    //手工回滚异常
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                }
+            }
+        }
         log.debug(CyUserUtil.getAuthenUsername() + "删除了ID为" +
                 sysUser.getBusinessId() + "的用户表信息");
         return new CyPersistModel(line);
@@ -186,9 +199,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
         int line = baseMapper.deleteById(sysUser);
         log.debug(CyUserUtil.getAuthenUsername() + "逻辑删除了ID为" +
                 sysUser.getBusinessId() + "的用户表信息");
-        if (synchronization)
-            jieLinkService.pushDelUserData(sysUser);
-        return new CyPersistModel(line);
+        if (synchronization && jieLinkService.pushDelUserData(sysUser))
+            return new CyPersistModel(line);
+        else
+            return new CyPersistModel(0);
     }
 
     /**
@@ -579,7 +593,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
                 sysUser.setIdentity("1");
                 sysUser.setUsername(sysUser.getPhone());
                 sysUser.setCreateDate(new Date());
-                sysUserRepositorys.addSysUser(sysUser);
+                SysUser user = new SysUser();
+                BeanUtil.copyProperties(sysUser, user);
+                persist(user);
+                //sysUserRepositorys.addSysUser(sysUser);
             }
         }
         if (null != errorDTOArrayList && errorDTOArrayList.size() > 0) {

src/main/resources/mapper/SysUserRepositorys.xml

@@ -225,6 +225,7 @@
         insert into sys_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="username != null">username ,</if>
+            <if test="personId != null">person_id ,</if>
             <if test="userType != null">user_type ,</if>
             <if test="name != null">name ,</if>
             <if test="sex != null">sex ,</if>
@@ -246,6 +247,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="username != null">#{username},</if>
+            <if test="personId != null">#{personId} ,</if>
             <if test="userType != null">#{userType},</if>
             <if test="name != null">#{name},</if>
             <if test="sex != null">#{sex},</if>