格克

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/makeUpCard/mapper/xml/MakeUpCardMapper.xml

@@ -25,5 +25,6 @@
         <if test="date!=null and ''!=date">
             and  date_format(a.time,'%Y-%m-%d')=date_format(#{date},'%Y-%m-%d')
         </if>
+        order by a.commit_date desc
     </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -306,6 +306,18 @@ public class SysUserController {
 			user.setPassword(passwordEncode);
 			user.setStatus(1);
 			user.setDelFlag(CommonConstant.DEL_FLAG_0);
+            String[] arr = selectedDeparts.split(",");
+            boolean f=true;
+            if(oConvertUtils.isNotEmpty(selectedDeparts)) {
+                for(String str:arr){
+                    String pid = sysUserDepartService.getPid(str);
+                    if (pid!=null&&!str.equals("34")&&!pid.equals("34")){
+                        f=false;
+                    }
+                }
+            }if (f){
+                user.setIsSalary("1");
+            }
 			sysUserService.addUserWithRole(user, selectedRoles);
             sysUserService.addUserWithDepart(user, selectedDeparts);
             HistoryWages historyWages=new HistoryWages();
@@ -352,7 +364,18 @@ public class SysUserController {
 				user.setPassword(sysUser.getPassword());
 				String roles = jsonObject.getString("selectedroles");
                 String departs = jsonObject.getString("selecteddeparts");
-
+                String[] arr = departs.split(",");
+                boolean f=true;
+                if(oConvertUtils.isNotEmpty(departs)) {
+                    for(String str:arr){
+                        String pid = sysUserDepartService.getPid(str);
+                        if (pid!=null&&!str.equals("34")&&!pid.equals("34")){
+                            f=false;
+                        }
+                    }
+                }if (f){
+                    user.setIsSalary("1");
+                }
 				sysUserService.editUserWithRole(user, roles);
                 sysUserService.editUserWithDepart(user, departs);
                 sysUserService.updateNullPhoneEmail();
@@ -780,7 +803,18 @@ public class SysUserController {
                     sysUserExcel.setDelFlag(Integer.parseInt(CommonConstant.DEL_FLAG_0.toString()));
                     sysUserExcel.setStatus(1);
                     sysUserExcel.setInfoSy(3);
-
+                    boolean f=true;
+                    if(oConvertUtils.isNotEmpty(sysUserExcel.getOrgCodeTxt())) {
+                        for(String str:sysUserExcel.getOrgCodeTxt().split(",")){
+                            String departLis = departMapper.getDepartLis(str);
+                            String pid = sysUserDepartService.getPid(departLis);
+                            if (pid!=null&&!departLis.equals("34")&&!pid.equals("34")){
+                                f=false;
+                            }
+                        }
+                    }if (f){
+                        sysUserExcel.setIsSalary("1");
+                    }
                     try {
                         if (!"".equals(sysUserExcel.getRealname())&&sysUserExcel.getRealname()!=null){
                             if (!"".equals(sysUserExcel.getEmail())&&sysUserExcel.getEmail()!=null){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java

@@ -15,4 +15,6 @@ public interface SysUserDepartMapper extends BaseMapper<SysUserDepart>{
 	//根据用户id查询部门id
 	List<String>getUserDepart(@Param("userId")String userId);
 
+	String getPid(@Param("id")String id);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml

@@ -15,4 +15,10 @@
 		select dep_id from sys_user_depart
 		where user_id=#{userId}
 	</select>
+    <select id="getPid" resultType="java.lang.String">
+		select parent_id from sys_depart where 1=1
+		<if test="id!=null and ''!=id">
+			and id=#{id}
+		</if>
+	</select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java

@@ -44,4 +44,5 @@ public interface ISysUserDepartService extends IService<SysUserDepart> {
 
 	List<String>getUserDepart(String userId);
 
+	String getPid(String id);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java

@@ -141,5 +141,10 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
 		return sysUserDepartMapper.getUserDepart(userId);
 	}
 
+	@Override
+	public String getPid(String id) {
+		return sysUserDepartMapper.getPid(id);
+	}
+
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/WeixinUserImpl.java

@@ -177,50 +177,58 @@ public class WeixinUserImpl implements IWeixinUserService{
                         }
                     }
                 }
-            }
-
-            sysUser.setDelFlag(Integer.parseInt(CommonConstant.DEL_FLAG_0.toString()));
-            sysUser.setStatus(1);
-            sysUser.setCreateTime(new Date());
-            if (!"".equals(ls.getPosition()) && ls.getPosition() != null) {
-                String one = positionService.getOne(ls.getPosition());
-                if (!"".equals(one) && one != null) {
-                    sysUser.setPost(one);
+            }if (workNo!=null&&!workNo.equals("")) {
+                sysUser.setDelFlag(Integer.parseInt(CommonConstant.DEL_FLAG_0.toString()));
+                sysUser.setStatus(1);
+                sysUser.setCreateTime(new Date());
+                if (!"".equals(ls.getPosition()) && ls.getPosition() != null) {
+                    String one = positionService.getOne(ls.getPosition());
+                    if (!"".equals(one) && one != null) {
+                        sysUser.setPost(one);
+                    }
                 }
-            }
-            SysUserRole sysUserRole=new SysUserRole();
-            sysUserRole.setUserId(ls.getUserid());
-            sysUserRole.setRoleId("1473241527673765890");
-            String userIden = "1";
-            if (ls.getIs_leader_in_dept() != null && ls.getIs_leader_in_dept().length > 0) {
-                if (ls.getIs_leader_in_dept()[0].equals("1") || ls.getIs_leader_in_dept()[0] == "1") {
-                    userIden = "2";
-                    sysUserRole.setRoleId("1462659329857978370");
+                SysUserRole sysUserRole = new SysUserRole();
+                sysUserRole.setUserId(ls.getUserid());
+                sysUserRole.setRoleId("1473241527673765890");
+                String userIden = "1";
+                if (ls.getIs_leader_in_dept() != null && ls.getIs_leader_in_dept().length > 0) {
+                    if (ls.getIs_leader_in_dept()[0].equals("1") || ls.getIs_leader_in_dept()[0] == "1") {
+                        userIden = "2";
+                        sysUserRole.setRoleId("1462659329857978370");
+                    }
                 }
-            }
 
-            sysUser.setUserIdentity(Integer.parseInt(userIden));
-            String[] department = ls.getDepartment();
-            if (department.length > 0) {
-                sysUserService.delUserByUserID(ls.getUserid());
-                for (String depId : department) {
-                    SysUserDepart sysUserDepart = new SysUserDepart();
-                    sysUserDepart.setUserId(ls.getUserid());
-                    sysUserDepart.setDepId(depId);
-                    depids += depId + ",";
-                    Boolean aBoolean = sysUserDepartService.saveUserDepart(sysUserDepart);
+                sysUser.setUserIdentity(Integer.parseInt(userIden));
+                String[] department = ls.getDepartment();
+                boolean f = true;
+                if (department.length > 0) {
+                    sysUserService.delUserByUserID(ls.getUserid());
+                    for (String depId : department) {
+                        String pid = sysUserDepartService.getPid(depId);
+                        if (pid!=null&&!pid.equals("34")&&!depId.equals("34")) {
+                            f = false;
+                        }
+                        SysUserDepart sysUserDepart = new SysUserDepart();
+                        sysUserDepart.setUserId(ls.getUserid());
+                        sysUserDepart.setDepId(depId);
+                        depids += depId + ",";
+                        Boolean aBoolean = sysUserDepartService.saveUserDepart(sysUserDepart);
+                    }
+                }
+                if (f) {
+                    sysUser.setIsSalary("1");
                 }
+                sysUser.setCode(workNo);
+                sysUser.setUsername(workNo);
+                sysUser.setWorkNo(workNo);
+                sysUser.setDepartIds(depids);
+                sysUser.setCategory(101);
+                sysUser.setEmploymentStatus(10);
+                sysUser.setInfoSy(3);
+                sysUser.setSfzType("0");
+
+                Boolean add = sysUserService.add(sysUser, sysUserRole);
             }
-            sysUser.setCode(workNo);
-            sysUser.setUsername(workNo);
-            sysUser.setWorkNo(workNo);
-            sysUser.setDepartIds(depids);
-            sysUser.setCategory(101);
-            sysUser.setEmploymentStatus(10);
-            sysUser.setInfoSy(3);
-            sysUser.setSfzType("0");
-            sysUser.setIsAttendance("0");
-            Boolean add = sysUserService.add(sysUser,sysUserRole);
         }catch (Exception e){
             e.printStackTrace();
             StringWriter sw = new StringWriter();
@@ -1074,9 +1082,15 @@ public class WeixinUserImpl implements IWeixinUserService{
                             work.setBeginDate(beginDate);
                             work.setEndDate(EndDate);
                             work.setDuration(String.valueOf(countDa));
-                        }else if (s.equals("Textarea")){
+                        }else if (s.equals("Textarea")&&work.getDemo()==null){
                             value = (Map) ll.get("value");
                             work.setDemo(value.get("text").toString());
+                        }else if (s.equals("Selector")&&work.getDemo()==null){
+                            value = (Map) ll.get("value");
+                            value = (Map) value.get("selector");
+                            List<Map>t=(List<Map>) value.get("options");
+                            List<Map>tt=(List<Map>)t.get(0).get("value");
+                            work.setDemo(tt.get(0).get("text").toString());
                         }
                     }
                 }