格克

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/salary/mapper/xml/SalaryMapper.xml

@@ -68,6 +68,6 @@
         <if test="date!=null and ''!=date">
             and date_format(wages_date,'%Y-%m')=date_format(#{date},'%Y-%m')
         </if>
-          and del_flag='0' order by wages_date desc
+          order by wages_date desc
     </select>
 </mapper>

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

@@ -13,10 +13,7 @@ import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.MD5Util;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.entity.SysDepartPermission;
-import org.jeecg.modules.system.entity.SysPermission;
-import org.jeecg.modules.system.entity.SysPermissionDataRule;
-import org.jeecg.modules.system.entity.SysRolePermission;
+import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.model.SysPermissionTree;
 import org.jeecg.modules.system.model.TreeModel;
 import org.jeecg.modules.system.service.*;
@@ -52,6 +49,8 @@ public class SysPermissionController {
 	@Autowired
 	private ISysDepartPermissionService sysDepartPermissionService;
 
+	@Autowired
+	private  ISysUserService userService;
 	/**
 	 * 加载数据节点
 	 * 
@@ -811,8 +810,16 @@ public class SysPermissionController {
 	 * @return
 	 */
 	@RequestMapping(value = "/qeryPerssion")
-	public List<Map<String,Object>>qeryPerssion(String userid){
+	public  Result<Map<String,Object>>qeryPerssion(String userid){
+		Result<Map<String,Object>> result = new Result<>();
+		Map<String,Object>mp=new HashMap<>();
 		List<Map<String, Object>> maps = sysPermissionService.queryH5ByUsername(userid);
-		return maps;
+		mp.put("men",maps);
+		SysUser byId = userService.getById(userid);
+		if (byId!=null){
+			mp.put("user",byId);
+		}
+		result.setResult(mp);
+		return result;
 	}
 }

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

@@ -662,7 +662,7 @@ public class SysUserController {
         QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(sysUser, request.getParameterMap());
         //Step.2 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
+        Page<SysUser> page = new Page<SysUser>(1, 10000);
         //update-begin--Author:kangxiaolin  Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据--------------------
         String selections = request.getParameter("selections");
        if(!oConvertUtils.isEmpty(selections)){
@@ -688,23 +688,33 @@ public class SysUserController {
         mv.addObject(NormalExcelConstants.FILE_NAME, "员工列表");
         mv.addObject(NormalExcelConstants.CLASS, SysUser.class);
 		LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
-        ExportParams exportParams = new ExportParams("员工列表数据", "导出人:"+user.getRealname(), "导出信息");
-        exportParams.setImageBasePath(upLoadPath);
-        mv.addObject(NormalExcelConstants.PARAMS, exportParams);
-        if (sysUser.getOrgCodeTxt().equals("空白模板")){
+        String sName="员工信息列表";
+        if (sysUser.getOrgCodeTxt()!=null&&!sysUser.getOrgCodeTxt().equals("")&&sysUser.getOrgCodeTxt().equals("空白模板")){
+            sName="员工信息模板";
             SysUser u=new SysUser();
             u.setRealname("例:李四");
             u.setEgName("例:cent");
             u.setEmail("例:cent.li@gksports.com.cn");
-            u.setWorkNo("200001");
-            u.setSfzCode("430424197506127677");
+            u.setWorkNo("例:200001");
+            u.setSfzCode("例:430424197506127677");
             u.setCategory(101);
             u.setEmploymentStatus(10);
             u.setOrgCodeTxt("例:销售部,信息部");
+            u.setSex(1);
+            u.setPhone("例:15211749625");
+            u.setBirthday(new Date());
+            u.setEntryDate(new Date());
+            u.setUrgentName("例:张三");
+            u.setUrgentPhone("例:15211468754");
+            u.setBankCard("例:622************142");
+            u.setBankAddr("例:上海工商银行徐汇支行");
+            u.setSyFund("例:061***********245");
             pageList=new ArrayList<>();
             pageList.add(u);
         }
+        ExportParams exportParams = new ExportParams("员工列表数据", "导出人:"+user.getRealname(), sName);
+        exportParams.setImageBasePath(upLoadPath);
+        mv.addObject(NormalExcelConstants.PARAMS, exportParams);
         mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
 
         return mv;
@@ -751,8 +761,11 @@ public class SysUserController {
                     sysUserExcel.setWorkNo(workNo);
                     sysUserExcel.setCode(workNo);
                     sysUserExcel.setId(workNo);
+                    sysUserExcel.setIsAttendance("0");
                     if (sysUserExcel.getEmploymentStatus()==null||sysUserExcel.getEmploymentStatus().equals("")){
                         sysUserExcel.setEmploymentStatus(10);
+                    } if (sysUserExcel.getEntryDate()==null){
+                        sysUserExcel.setEntryDate(new Date());
                     }
                     sysUserExcel.setUsername(workNo);
                     if (StringUtils.isBlank(sysUserExcel.getPassword())) {

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

@@ -356,7 +356,7 @@ on a.depart_name=b.orgCodeTxt
 
 	<select id="selectByUser" resultType="org.jeecg.modules.system.vo.DepartTreeVo">
 		select c.id ,c.realname as 'name',c.avatar,'true' as 'user' from sys_depart a left join sys_user_depart b on a.id=b.dep_id left join sys_user c on b.user_id=c.id
-		where a.id=#{id}
+		where a.id=#{id} and  c.del_flag='0'
 	</select>
 	<select id="DeptTree" resultType="org.jeecg.modules.system.vo.DepartTreeVo">
 		select id, depart_name as 'name',parent_id as 'pid' from sys_depart where 1=1

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

@@ -219,6 +219,7 @@ public class WeixinUserImpl implements IWeixinUserService{
             sysUser.setEmploymentStatus(10);
             sysUser.setInfoSy(3);
             sysUser.setSfzType("1");
+            sysUser.setIsAttendance("0");
             Boolean add = sysUserService.add(sysUser,sysUserRole);
         }catch (Exception e){
             e.printStackTrace();