Browse Source

修改同步展示bug

hcst_sunzhen 4 years ago
parent
commit
1955139e09

+ 1 - 1
src/main/java/cn/com/ctop/okr/mapper/QYWxUserInfoMapper.java

@@ -26,7 +26,7 @@ public interface QYWxUserInfoMapper extends BaseMapper<QYWxUserInfo> {
 
     void updateUserDepartMapOpenIdByUserid(@Param("userid")String userid, @Param("openId")String openId);
 
-    List<UserInfoDto> getUserListByName(@Param("name")String name);
+    List<UserInfoDto> getUserListByName(@Param("name")String name, @Param("userid")String userid);
 
     QYWxUserInfo getUserInfoByUserid(@Param("userid")String userid);
 

+ 1 - 0
src/main/java/cn/com/ctop/okr/mapper/xml/QYWxUserInfoMapper.xml

@@ -87,6 +87,7 @@
         from
         wx_user_info
         where
+        userid != #{userid}
         <if test="name != null">
             name like concat('%', #{name}, '%') and
         </if>

+ 1 - 1
src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java

@@ -299,7 +299,6 @@ public class OkrServiceImpl implements OkrService {
         Integer isCurrentQuarter = null;
         Map<String, Object> map = new HashMap<>();
         //List<List<Map<String, Object>>> list = new ArrayList<>();
-        List<String> userList = okrMemberMapper.getSyncUserListByMemberId(memberId, year, quarter, name);
 
         Integer todayQuarter = DateUtils.getQuarter(new Date());
         Integer todayYear = DateUtils.getYear(new Date());
@@ -315,6 +314,7 @@ public class OkrServiceImpl implements OkrService {
             isCurrentQuarter = 0;
         }
 
+        List<String> userList = okrMemberMapper.getSyncUserListByMemberId(memberId, year, quarter, name);
         List<Map<String, Object>> mapList = new ArrayList<>();
         if(userList!=null && userList.size()!=0){
             List<OkrObjectInfo> OkrObjectInfoList = okrObjectInfoMapper.getAllQuarterObject(userList, year, quarter);

+ 5 - 1
src/main/java/cn/com/ctop/okr/service/impl/QYWxServiceImpl.java

@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jdk.nashorn.internal.runtime.UserAccessorProperty;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -146,7 +147,10 @@ public class QYWxServiceImpl extends ServiceImpl<CorpUserInfoMapper, CorpUserInf
     //根据名字模糊查询企业微信用户
     @Override
     public List<UserInfoDto> getUserListByName(String name){
-        return wxUserInfoMapper.getUserListByName(name);
+        QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
+        String userId = sysUser.getOpenId();
+
+        return wxUserInfoMapper.getUserListByName(name, userId);
     }
 
     //根据名字模糊查询企业微信用户