格克

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java

@@ -151,7 +151,7 @@ public class ShiroRealm extends AuthorizingRealm {
                 String newAuthorization = JwtUtil.sign(userName, passWord);
                 // 设置超时时间
                 redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, newAuthorization);
-                redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME *2 / 1000);
+                ///redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME *2 / 1000);
                 log.debug("——————————用户在线操作，更新token保证不掉线—————————jwtTokenRefresh——————— "+ token);
             }
             //update-begin--Author:scott  Date:20191005  for：解决每次请求，都重写redis中 token缓存问题

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

@@ -77,7 +77,48 @@ public class SysPositionController {
         result.setResult(pageList);
         return result;
     }
+    /**
+     * 分页列表查询
+     *
+     * @param sysPosition
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "职务表-分页列表查询")
+    @ApiOperation(value = "职务表-分页列表查询", notes = "职务表-分页列表查询")
+    @GetMapping(value = "/lists")
+    public Result<IPage<SysPosition>> queryPageLists(SysPosition sysPosition,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+        Result<IPage<SysPosition>> result = new Result<IPage<SysPosition>>();
+        Page<SysPosition> page = new Page<SysPosition>(pageNo, pageSize);
+        IPage<SysPosition> pageList = sysPositionService.lists(page,sysPosition);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
 
+    @AutoLog(value = "职务表-分页列表查询")
+    @ApiOperation(value = "职务表-分页列表查询", notes = "职务表-分页列表查询")
+    @GetMapping(value = "/listByDept")
+    public Result<IPage<SysPosition>> listByDept(SysPosition sysPosition,
+                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                     HttpServletRequest req) {
+        Result<IPage<SysPosition>> result = new Result<IPage<SysPosition>>();
+        Page<SysPosition> page = new Page<SysPosition>(pageNo, pageSize);
+        List<String>deptids=null;
+        if (sysPosition.getDeptId()!=null){
+            deptids=Arrays.asList(sysPosition.getDeptId().split(","));
+        }
+        IPage<SysPosition> pageList = sysPositionService.listByDept(page,deptids);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
     /**
      * 添加
      *

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

@@ -1751,19 +1751,19 @@ public class SysUserController {
         String card="";
         SysUser ones = sysUserService.getOnes(userid);
         if (ones!=null){
-            card=ones.getBankCard().substring(0,4);
+            card=ones.getSfzCode().substring(0,6);
         }
         return card;//返回验证码
     }
-    //邮箱验证
+    //身份证验证
     @RequestMapping(value = "/GetEamilCode", method = RequestMethod.GET)
     public String TPEamilCode(String userid,String card){
         String msg="err";
         SysUser ones = sysUserService.getOnes(userid);
         if (ones!=null){
-            if (ones.getBankCard()!=null&&!ones.getBankCard().equals("")){
-                String bankCard = ones.getBankCard();
-                String substring = bankCard.substring(bankCard.length() - 4, bankCard.length());
+            if (ones.getSfzCode()!=null&&!ones.getSfzCode().equals("")){
+                String bankCard = ones.getSfzCode();
+                String substring = bankCard.substring(bankCard.length() - 6, bankCard.length());
                 if (card.equals(substring)){
                     msg="ok";
                 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPosition.java

@@ -44,6 +44,13 @@ public class SysPosition {
     @Excel(name = "职务名称", width = 15)
     @ApiModelProperty(value = "职务名称")
     private java.lang.String name;
+
+    @ApiModelProperty(value = "部门名称")
+    private java.lang.String deptName;
+
+    @ApiModelProperty(value = "部门id")
+    private java.lang.String deptId;
+
     /**
      * 职级
      */

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -133,7 +133,14 @@ public class SysUser implements Serializable {
      */
     @Excel(name = "*电话", width = 15)
     private String phone;
-
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 家庭住址
+     */
+    private String addr;
     /**部门名称*/
     @Excel(name = "*部门", width = 15)
     private transient String orgCodeTxt;

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

@@ -1,8 +1,12 @@
 package org.jeecg.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.entity.SysPosition;
+import org.jeecg.modules.system.entity.SysUser;
+
+import java.util.List;
 
 /**
  * @Description: 职务表
@@ -15,4 +19,8 @@ public interface SysPositionMapper extends BaseMapper<SysPosition> {
     //根据获取企业微信的职位名称查询对应code值
     String getOne(@Param("name")String name);
 
+    List<SysPosition> lists(Page<SysPosition> page, @Param("sysPosition") SysPosition sysPosition);
+
+    List<SysPosition>listByDept(Page<SysPosition> page, @Param("deptids")List<String> deptids);
+
 }

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

@@ -9,4 +9,28 @@
  </if>
 
     </select>
+    <select id="lists" resultType="org.jeecg.modules.system.entity.SysPosition">
+        select a.*,b.depart_name as 'deptName' from sys_position a left join sys_depart b on a.dept_id=b.id
+        where 1=1
+        <if test="sysPosition.deptName!=null and ''!=sysPosition.deptName">
+            and b.depart_name like concat(concat('%',#{sysPosition.deptName}),'%')
+        </if>
+        <if test="sysPosition.code!=null and ''!=sysPosition.code">
+            and a.code like concat(concat('%',#{sysPosition.code}),'%')
+        </if>
+        <if test="sysPosition.name!=null and ''!=sysPosition.name">
+            and a.name like concat(concat('%',#{sysPosition.name}),'%')
+        </if>
+         order by create_time desc
+    </select>
+    <select id="listByDept" resultType="org.jeecg.modules.system.entity.SysPosition">
+        select a.*,b.depart_name as 'deptName' from sys_position a left join sys_depart b on a.dept_id=b.id
+        where 1=1
+        <if test="deptids!=null and deptids.size()>0">
+        and b.id in
+            <foreach collection="deptids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+    </select>
 </mapper>

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

@@ -1,8 +1,12 @@
 package org.jeecg.modules.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.entity.SysPosition;
+import org.jeecg.modules.system.entity.SysUser;
+
+import java.util.List;
 
 /**
  * @Description: 职务表
@@ -13,5 +17,6 @@ import org.jeecg.modules.system.entity.SysPosition;
 public interface ISysPositionService extends IService<SysPosition> {
     //根据获取企业微信的职位名称查询对应code值
     String getOne(String name);
-
+    Page<SysPosition> lists(Page<SysPosition> page,SysPosition sysPosition);
+    Page<SysPosition>listByDept(Page<SysPosition> page,List<String> deptids);
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.modules.system.entity.SysPosition;
@@ -9,6 +10,8 @@ import org.jeecg.modules.system.util.UrlData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description: 职务表
  * @Author: jeecg-boot
@@ -34,4 +37,14 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
         }
 
     }
+
+    @Override
+    public Page<SysPosition> lists(Page<SysPosition> page, SysPosition sysPosition) {
+        return page.setRecords(positionMapper.lists(page,sysPosition));
+    }
+
+    @Override
+    public Page<SysPosition> listByDept(Page<SysPosition> page, List<String> deptids) {
+        return page.setRecords(positionMapper.listByDept(page,deptids));
+    }
 }

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

@@ -159,10 +159,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 				sysUserRoleMapper.insert(userRole);
 			}
 		}else {
-			if (user.getUserIdentity().equals("2")||user.getUserIdentity()==2){
-				SysUserRole userRole = new SysUserRole(user.getId(), "1462659329857978370");
-				sysUserRoleMapper.insert(userRole);
-			}else {
+			if (user.getUserIdentity().equals("1")||user.getUserIdentity()==1){
 				SysUserRole userRole = new SysUserRole(user.getId(), "1473241527673765890");
 				sysUserRoleMapper.insert(userRole);
 			}
@@ -183,10 +180,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 				sysUserRoleMapper.insert(userRole);
 			}
 		}else {
-			if (user.getUserIdentity().equals("2")||user.getUserIdentity()==2){
-				SysUserRole userRole = new SysUserRole(user.getId(), "1462659329857978370");
-				sysUserRoleMapper.insert(userRole);
-			}else {
+			if (user.getUserIdentity().equals("1")||user.getUserIdentity()==1){
 				SysUserRole userRole = new SysUserRole(user.getId(), "1473241527673765890");
 				sysUserRoleMapper.insert(userRole);
 			}

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

@@ -1345,14 +1345,14 @@ public class WeixinUserImpl implements IWeixinUserService{
                     parm.put("person", map);
                     String s = JSONObject.toJSONString(parm);
                    try {
-                       String s1 = PersonAdd(s);
+                       msg = PersonAdd(s);
                    }catch (Exception e){
                        e.printStackTrace();
                    }
-//                    if (!s1.equals("0")){
-//                        msg=s1;
-//                    }
-                    sysUserService.updateTpUser(ls.getId());
+                    if (msg.equals("0")){
+                        sysUserService.updateTpUser(ls.getId());
+                    }
+
             }
         }
         maps.put("msg",msg);