diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SysEnclosureController.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SysEnclosureController.java index 2dd4f1e5..1bcedaa9 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SysEnclosureController.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/controller/SysEnclosureController.java @@ -130,72 +130,6 @@ public class SysEnclosureController { sysEnclosureService.querySysEnclosureListToTreeByUserId(inputObject, outputObject); } - /** - * 人员选择获取所有公司和人 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/SysEnclosureController/queryAllPeopleToTree") - public void queryAllPeopleToTree(InputObject inputObject, OutputObject outputObject) { - sysEnclosureService.queryAllPeopleToTree(inputObject, outputObject); - } - - /** - * 人员选择根据当前用户所属公司获取这个公司的人 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/SysEnclosureController/queryCompanyPeopleToTreeByUserBelongCompany") - public void queryCompanyPeopleToTreeByUserBelongCompany(InputObject inputObject, OutputObject outputObject) { - sysEnclosureService.queryCompanyPeopleToTreeByUserBelongCompany(inputObject, outputObject); - } - - /** - * 人员选择根据当前用户所属公司获取这个公司部门展示的人 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/SysEnclosureController/queryDepartmentPeopleToTreeByUserBelongDepartment") - public void queryDepartmentPeopleToTreeByUserBelongDepartment(InputObject inputObject, OutputObject outputObject) { - sysEnclosureService.queryDepartmentPeopleToTreeByUserBelongDepartment(inputObject, outputObject); - } - - /** - * 人员选择根据当前用户所属公司获取这个公司岗位展示的人 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/SysEnclosureController/queryJobPeopleToTreeByUserBelongJob") - public void queryJobPeopleToTreeByUserBelongJob(InputObject inputObject, OutputObject outputObject) { - sysEnclosureService.queryJobPeopleToTreeByUserBelongJob(inputObject, outputObject); - } - - /** - * 人员选择根据当前用户所属公司获取这个公司同级部门展示的人 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/SysEnclosureController/querySimpleDepPeopleToTreeByUserBelongSimpleDep") - public void querySimpleDepPeopleToTreeByUserBelongSimpleDep(InputObject inputObject, OutputObject outputObject) { - sysEnclosureService.querySimpleDepPeopleToTreeByUserBelongSimpleDep(inputObject, outputObject); - } - - /** - * 根据聊天组展示用户 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/SysEnclosureController/queryTalkGroupUserListByUserId") - public void queryTalkGroupUserListByUserId(InputObject inputObject, OutputObject outputObject) { - sysEnclosureService.queryTalkGroupUserListByUserId(inputObject, outputObject); - } - /** * 一次性上传附件 * diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/dao/SysEnclosureDao.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/dao/SysEnclosureDao.java index c9ff08f0..7c05ffcb 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/dao/SysEnclosureDao.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/dao/SysEnclosureDao.java @@ -31,20 +31,6 @@ public interface SysEnclosureDao { List> querySysEnclosureListToTreeByUserId(Map map); - List> queryAllPeopleToTree(Map map); - - List> queryCompanyPeopleToTreeByUserBelongCompany(Map map); - - Map queryCompanyMationByUserId(Map user); - - List> queryDepartmentPeopleToTreeByUserBelongDepartment(Map map); - - List> queryJobPeopleToTreeByUserBelongJob(Map map); - - List> querySimpleDepPeopleToTreeByUserBelongSimpleDep(Map map); - - List> queryTalkGroupUserListByUserId(Map map); - List> queryEnclosureInfo(@Param("enclosure") String enclosure); } diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java index 49a74c44..19836e0d 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java @@ -32,18 +32,6 @@ public interface SysEnclosureService { void querySysEnclosureListToTreeByUserId(InputObject inputObject, OutputObject outputObject); - void queryAllPeopleToTree(InputObject inputObject, OutputObject outputObject); - - void queryCompanyPeopleToTreeByUserBelongCompany(InputObject inputObject, OutputObject outputObject); - - void queryDepartmentPeopleToTreeByUserBelongDepartment(InputObject inputObject, OutputObject outputObject); - - void queryJobPeopleToTreeByUserBelongJob(InputObject inputObject, OutputObject outputObject); - - void querySimpleDepPeopleToTreeByUserBelongSimpleDep(InputObject inputObject, OutputObject outputObject); - - void queryTalkGroupUserListByUserId(InputObject inputObject, OutputObject outputObject); - void insertUploadFileToDataByUserId(InputObject inputObject, OutputObject outputObject); void queryEnclosureInfo(InputObject inputObject, OutputObject outputObject); diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SearchConfigServiceImpl.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SearchConfigServiceImpl.java index 7ca3762c..de13cb0a 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SearchConfigServiceImpl.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SearchConfigServiceImpl.java @@ -19,7 +19,6 @@ import com.skyeye.eve.entity.search.SearchParamsConfigMation; import com.skyeye.eve.service.ISearchConfigService; import com.skyeye.eve.service.SearchConfigService; import com.skyeye.jedis.JedisClientService; -import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -29,7 +28,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -75,10 +73,8 @@ public class SearchConfigServiceImpl implements SearchConfigService { Map result = querySearchParamsConfig(urlId, appId); if (result != null) { result.forEach((key, value) -> { - Map classMap = new HashMap(); - classMap.put("searchCondition", SearchOperatorMation.class); - SearchParamsConfigMation searchParamsConfigMation = (SearchParamsConfigMation) JSONObject.toBean((JSONObject) value, - SearchParamsConfigMation.class, classMap); + String valueStr = JSONUtil.toJsonStr(value); + SearchParamsConfigMation searchParamsConfigMation = JSONUtil.toBean(valueStr, SearchParamsConfigMation.class); // 获取筛选条件 List searchCondition = searchParamsConfigMation.getSearchCondition(); if (CollectionUtils.isNotEmpty(searchCondition)) { @@ -123,7 +119,7 @@ public class SearchConfigServiceImpl implements SearchConfigService { public Map querySearchParamsConfig(String urlId, String appId) { SearchMation searchMation = querySearchMation(urlId, appId); if (searchMation != null) { - Map result = JSONObject.fromObject(searchMation.getParamsConfigStr()); + Map result = JSONUtil.toBean(searchMation.getParamsConfigStr(), null); return result; } return null; diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java index c2c6d2ff..88992261 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java @@ -354,130 +354,6 @@ public class SysEnclosureServiceImpl implements SysEnclosureService { outputObject.setBeans(beans); } - /** - * 人员选择获取所有公司和人 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void queryAllPeopleToTree(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - map = compareSelUserListByParams(map, inputObject); - List> beans = sysEnclosureDao.queryAllPeopleToTree(map); - outputObject.setBeans(beans); - } - - /** - * 人员选择根据当前用户所属公司获取这个公司的人 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void queryCompanyPeopleToTreeByUserBelongCompany(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - map = compareSelUserListByParams(map, inputObject); - Map user = inputObject.getLogParams(); - //根据用户信息获取该用户所属的公司id。部门id，职位id - Map company = sysEnclosureDao.queryCompanyMationByUserId(user); - map.put("companyId", company.get("companyId")); - List> beans = sysEnclosureDao.queryCompanyPeopleToTreeByUserBelongCompany(map); - outputObject.setBeans(beans); - } - - /** - * 人员选择根据当前用户所属公司获取这个公司部门展示的人 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void queryDepartmentPeopleToTreeByUserBelongDepartment(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - map = compareSelUserListByParams(map, inputObject); - Map user = inputObject.getLogParams(); - //根据用户信息获取该用户所属的公司id。部门id，职位id - Map company = sysEnclosureDao.queryCompanyMationByUserId(user); - map.put("companyId", company.get("companyId")); - List> beans = sysEnclosureDao.queryDepartmentPeopleToTreeByUserBelongDepartment(map); - outputObject.setBeans(beans); - } - - /** - * 人员选择根据当前用户所属公司获取这个公司岗位展示的人 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void queryJobPeopleToTreeByUserBelongJob(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - map = compareSelUserListByParams(map, inputObject); - Map user = inputObject.getLogParams(); - //根据用户信息获取该用户所属的公司id。部门id，职位id - Map company = sysEnclosureDao.queryCompanyMationByUserId(user); - map.put("companyId", company.get("companyId")); - List> beans = sysEnclosureDao.queryJobPeopleToTreeByUserBelongJob(map); - outputObject.setBeans(beans); - } - - /** - * 人员选择根据当前用户所属公司获取这个公司同级部门展示的人 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void querySimpleDepPeopleToTreeByUserBelongSimpleDep(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - map = compareSelUserListByParams(map, inputObject); - Map user = inputObject.getLogParams(); - //根据用户信息获取该用户所属的公司id。部门id，职位id - Map company = sysEnclosureDao.queryCompanyMationByUserId(user); - map.put("departmentId", company.get("departmentId")); - List> beans = sysEnclosureDao.querySimpleDepPeopleToTreeByUserBelongSimpleDep(map); - outputObject.setBeans(beans); - } - - /** - * 根据聊天组展示用户 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void queryTalkGroupUserListByUserId(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - map = compareSelUserListByParams(map, inputObject); - Map user = inputObject.getLogParams(); - map.put("createId", user.get("id")); - List> beans = sysEnclosureDao.queryTalkGroupUserListByUserId(map); - outputObject.setBeans(beans); - } - - /** - * 获取人员列表时的参数转换 - * - * @param map - * @param inputObject 入参以及用户信息等获取对象 - * @return - */ - public Map compareSelUserListByParams(Map map, InputObject inputObject) { - //人员列表中是否包含自己--1.包含；其他参数不包含 - String chooseOrNotMy = map.get("chooseOrNotMy").toString(); - if (!"1".equals(chooseOrNotMy)) { - Map user = inputObject.getLogParams(); - map.put("userId", user.get("id")); - } - //人员列表中是否必须绑定邮箱--1.必须；其他参数没必要 - String chooseOrNotEmail = map.get("chooseOrNotEmail").toString(); - if ("1".equals(chooseOrNotEmail)) { - map.put("hasEmail", "1"); - } - return map; - } - /** * 一次性上传附件 * diff --git a/skyeye-promote/skyeye-common/src/main/resources/mapper/common/SysDictDataMapper.xml b/skyeye-promote/skyeye-common/src/main/resources/mapper/common/SysDictDataMapper.xml index 256bfe7a..d24ac527 100644 --- a/skyeye-promote/skyeye-common/src/main/resources/mapper/common/SysDictDataMapper.xml +++ b/skyeye-promote/skyeye-common/src/main/resources/mapper/common/SysDictDataMapper.xml @@ -53,12 +53,16 @@ - - - - - - - - - - - - - - SELECT a.id, - CONCAT_WS('_', b.company_name, a.department_name) departmentName, - a.department_desc departmentDesc, - (SELECT COUNT(*) FROM sys_eve_user_staff b WHERE b.department_id = a.id) userNum, - (SELECT COUNT(*) FROM company_job c WHERE c.department_id = a.id) jobNum + a.company_id companyId, + a.department_name departmentName, + a.department_desc departmentDesc FROM - company_department a, - company_mation b - WHERE a.company_id = b.id - - AND a.department_name LIKE '%${departmentName}%' - - - AND b.company_name LIKE '%${companyName}%' - + company_department a + + + ${sqlExtract} + + + AND a.`name` LIKE '%${keyword}%' + + ORDER BY a.create_time DESC - - + + \ No newline at end of file diff --git a/skyeye-promote/skyeye-organization/src/main/resources/mapper/organization/CompanyTaxRateMapper.xml b/skyeye-promote/skyeye-organization/src/main/resources/mapper/organization/CompanyTaxRateMapper.xml index 0ddb6bf1..38de434c 100644 --- a/skyeye-promote/skyeye-organization/src/main/resources/mapper/organization/CompanyTaxRateMapper.xml +++ b/skyeye-promote/skyeye-organization/src/main/resources/mapper/organization/CompanyTaxRateMapper.xml @@ -42,7 +42,10 @@ a.sort_no sortNo FROM company_tax_rate a - WHERE a.company_id = #{companyId} + WHERE a.company_id IN + + #{companyId} + ORDER BY a.sort_no ASC diff --git a/skyeye-promote/skyeye-organization/src/main/resources/reqmapping/mapping/organization.xml b/skyeye-promote/skyeye-organization/src/main/resources/reqmapping/mapping/organization.xml index 956803fb..4bb767e8 100644 --- a/skyeye-promote/skyeye-organization/src/main/resources/reqmapping/mapping/organization.xml +++ b/skyeye-promote/skyeye-organization/src/main/resources/reqmapping/mapping/organization.xml @@ -1,45 +1,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -73,12 +37,6 @@ - - - - - - diff --git a/skyeye-promote/skyeye-user-phone/pom.xml b/skyeye-promote/skyeye-user-phone/pom.xml index 3b949cb3..bf449e3a 100644 --- a/skyeye-promote/skyeye-user-phone/pom.xml +++ b/skyeye-promote/skyeye-user-phone/pom.xml @@ -20,12 +20,17 @@ - com.skyeye skyeye-userauth 0.0.1-SNAPSHOT + + + com.skyeye + skyeye-organization + 0.0.1-SNAPSHOT + diff --git a/skyeye-promote/skyeye-user-phone/src/main/java/com/skyeye/service/impl/UserPhoneServiceImpl.java b/skyeye-promote/skyeye-user-phone/src/main/java/com/skyeye/service/impl/UserPhoneServiceImpl.java index f68ab61c..9f6ab51e 100644 --- a/skyeye-promote/skyeye-user-phone/src/main/java/com/skyeye/service/impl/UserPhoneServiceImpl.java +++ b/skyeye-promote/skyeye-user-phone/src/main/java/com/skyeye/service/impl/UserPhoneServiceImpl.java @@ -13,10 +13,13 @@ import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.DateUtil; import com.skyeye.common.util.ToolUtil; import com.skyeye.dao.UserPhoneDao; -import com.skyeye.personnel.dao.SysEveUserDao; import com.skyeye.eve.service.SysAuthorityService; import com.skyeye.jedis.JedisClientService; +import com.skyeye.organization.service.CompanyMationService; +import com.skyeye.organization.service.ICompanyService; +import com.skyeye.personnel.dao.SysEveUserDao; import com.skyeye.service.UserPhoneService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,6 +42,12 @@ public class UserPhoneServiceImpl implements UserPhoneService { @Autowired private SysAuthorityService sysAuthorityService; + @Autowired + private ICompanyService iCompanyService; + + @Autowired + private CompanyMationService companyMationService; + /** * 账号状态 */ @@ -133,6 +142,7 @@ public class UserPhoneServiceImpl implements UserPhoneService { //如果已经绑定用户，则获取用户信息 if (bean.containsKey("userId") && !ToolUtil.isBlank(bean.get("userId").toString())) { Map userMation = userPhoneDao.queryUserMationByOPenId(openId); + iCompanyService.setName(userMation, "companyId", "companyName"); // 2.将账号的信息存入redis SysUserAuthConstants.setUserLoginRedisCache(bean.get("userId").toString() + SysUserAuthConstants.APP_IDENTIFYING, userMation); //3.将权限的信息存入redis @@ -153,6 +163,7 @@ public class UserPhoneServiceImpl implements UserPhoneService { //如果已经绑定用户，则获取用户信息 if (map.containsKey("userId") && !ToolUtil.isBlank(map.get("userId").toString())) { Map userMation = userPhoneDao.queryUserMationByOPenId(openId); + iCompanyService.setName(userMation, "companyId", "companyName"); //2.将账号的信息存入redis SysUserAuthConstants.setUserLoginRedisCache(map.get("userId").toString() + SysUserAuthConstants.APP_IDENTIFYING, userMation); //3.将权限的信息存入redis @@ -245,6 +256,7 @@ public class UserPhoneServiceImpl implements UserPhoneService { Map map = inputObject.getParams(); map = compareSelUserListByParams(map, inputObject); List> beans = userPhoneDao.queryAllPeopleToTree(map); + beans.addAll(companyMationService.queryAllDataToTree(StringUtils.EMPTY)); beans = ToolUtil.listToTree(beans, "id", "pId", "children"); outputObject.setBeans(beans); } @@ -253,7 +265,7 @@ public class UserPhoneServiceImpl implements UserPhoneService { * 获取人员列表时的参数转换 * * @param map - * @param inputObject 入参以及用户信息等获取对象 + * @param inputObject 入参以及用户信息等获取对象 * @return */ public Map compareSelUserListByParams(Map map, InputObject inputObject) { diff --git a/skyeye-promote/skyeye-user-phone/src/main/resources/mapper/userphone/UserPhoneMapper.xml b/skyeye-promote/skyeye-user-phone/src/main/resources/mapper/userphone/UserPhoneMapper.xml index 9a3980a4..ab0d6534 100644 --- a/skyeye-promote/skyeye-user-phone/src/main/resources/mapper/userphone/UserPhoneMapper.xml +++ b/skyeye-promote/skyeye-user-phone/src/main/resources/mapper/userphone/UserPhoneMapper.xml @@ -85,13 +85,12 @@ b.win_bottom_menu_icon loadBottomMenuIcon, c.user_name userName, c.user_photo userPhoto, - p.company_name companyName, + c.company_id companyId, q.department_name departmentName FROM sys_eve_user a LEFT JOIN sys_eve_user_install b ON a.id = b.user_id LEFT JOIN sys_eve_user_staff c ON a.id = c.user_id - LEFT JOIN company_mation p ON c.company_id = p.id LEFT JOIN company_department q ON c.department_id = q.id, wx_user_mation e WHERE @@ -100,17 +99,6 @@ @@ -442,5 +435,237 @@ WHERE id = #{userId} + + + + + + + + + + + + \ No newline at end of file diff --git a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/personnel/SysEveUserStaffMapper.xml b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/personnel/SysEveUserStaffMapper.xml index 9a343e86..061a37fc 100644 --- a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/personnel/SysEveUserStaffMapper.xml +++ b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/personnel/SysEveUserStaffMapper.xml @@ -16,7 +16,7 @@ a.home_phone homePhone, a.qq, a.state, - u.company_name companyName, + a.company_id companyId, q.department_name departmentName, p.job_name jobName, a.`type` staffType, @@ -26,7 +26,6 @@ LEFT JOIN sys_eve_user_staff_time b ON a.id = b.staff_id LEFT JOIN company_job p ON a.job_id = p.id LEFT JOIN company_department q ON a.department_id = q.id - LEFT JOIN company_mation u ON a.company_id = u.id ${sqlExtract} @@ -144,7 +143,7 @@ a.trial_time trialTime, a.become_worker_time becomeWorkerTime, CASE a.user_sex WHEN '2' THEN '女' WHEN '1' THEN '男' ELSE '保密' END userSex, - u.company_name companyName, + a.company_id companyId, a.department_id departmentId, q.department_name departmentName, p.job_name jobName, @@ -154,7 +153,6 @@ LEFT JOIN company_job_score o ON a.job_score_id = o.id LEFT JOIN company_job p ON a.job_id = p.id LEFT JOIN company_department q ON a.department_id = q.id - LEFT JOIN company_mation u ON a.company_id = u.id WHERE a.id = #{staffId} @@ -224,7 +222,6 @@ IFNULL(a.user_sign, '暂无签名') userSign, CASE a.state WHEN '1' THEN 'state-up' WHEN '2' THEN 'state-down' END colorClass, a.company_id companyId, - u.company_name companyName, a.department_id departmentId, q.department_name departmentName, p.job_name jobName, @@ -235,8 +232,7 @@ LEFT JOIN company_job_score o ON a.job_score_id = o.id LEFT JOIN sys_eve_user b ON b.id = a.user_id, company_job p, - company_department q, - company_mation u + company_department q @@ -246,7 +242,6 @@ INSTR(CONCAT(',', #{staffIds}, ','), CONCAT(',', a.id, ',')) - AND a.company_id = u.id AND a.department_id = q.id AND a.job_id = p.id @@ -266,7 +261,6 @@ a.qq, a.state, a.company_id companyId, - u.company_name companyName, a.department_id departmentId, q.department_name departmentName, a.job_id jobId, @@ -278,10 +272,8 @@ sys_eve_user_staff a LEFT JOIN company_job_score o ON a.job_score_id = o.id, company_job p, - company_department q, - company_mation u - WHERE a.company_id = u.id - AND a.department_id = q.id + company_department q + WHERE a.department_id = q.id AND a.job_id = p.id AND a.user_name LIKE '%${userName}%' diff --git a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/CompanyChatMapper.xml b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/CompanyChatMapper.xml index 823e7a42..8ff1a6b5 100644 --- a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/CompanyChatMapper.xml +++ b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/CompanyChatMapper.xml @@ -8,13 +8,13 @@ a.id, 'online' status, b.user_photo avatar, - c.company_name companyName, + b.company_id companyId, d.department_name departmentName, b.user_sign sign FROM sys_eve_user a, - sys_eve_user_staff b LEFT JOIN company_mation c ON b.company_id = c.id - LEFT JOIN company_department d ON d.id = b.department_id + sys_eve_user_staff b + LEFT JOIN company_department d ON d.id = b.department_id WHERE a.id = b.user_id AND a.id = #{userId} @@ -55,7 +55,7 @@ 'offline' status, a.user_photo avatar, IFNULL(a.user_sign, '暂无签名') sign, - m.company_name companyName, + a.company_id companyId, m.department_name departmentName, m.job_name jobName FROM @@ -63,15 +63,12 @@ LEFT JOIN (SELECT o.user_id, p.job_name, - q.department_name, - u.company_name + q.department_name FROM sys_eve_user_staff o, company_job p, - company_department q, - company_mation u - WHERE o.company_id = u.id - AND o.department_id = q.id + company_department q + WHERE o.department_id = q.id AND o.job_id = p.id) m ON m.user_id = a.user_id, sys_eve_user b WHERE a.department_id = #{id} diff --git a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserStaffCapitalMapper.xml b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserStaffCapitalMapper.xml index 4cdceefe..e96fe004 100644 --- a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserStaffCapitalMapper.xml +++ b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserStaffCapitalMapper.xml @@ -28,20 +28,15 @@