xxjProject/low-consum-manage.git

			@@ -5,9 +5,14 @@
			import java.util.List;
			import java.util.Map;

			import org.apache.commons.compress.utils.Lists;
			import org.springframework.stereotype.Service;

			import com.consum.base.core.utils.MapUtils;
			import com.consum.base.core.utils.MapperUtil;
			import com.consum.base.core.utils.PageUtil;
			import com.consum.base.pojo.FinSysTenantUserSearchParam;
			import com.consum.base.pojo.response.FinSysTenantUserVO;
			import com.consum.base.service.FinSysTenantUserService;
			import com.consum.model.po.FinSysTenantUser;
			import com.iplatform.base.util.PlatformRSAUtils;
			@@ -24,7 +29,9 @@
			private static final String SQL_GET_USER =
			"SELECT * FROM fin_sys_tenant_user WHERE IS_DELETE = 0 AND `STATUS` = 1 AND TENANT_ID = ?";
			private static final String SQL_QH_PAGE_USER_PREFIX =
			"select fstu.* from FIN_SYS_TENANT_USER fstu where fstu.IS_DELETE = 0 ";
			"select fstu.id,fstu.USER_CODE,fstu.USER_NAME,fstu.USER_PHONE,fst.name tenantName,fstd.name sysDeptName,fstu.STATUS from FIN_SYS_TENANT_USER fstu "
			+ "left join fin_sys_tenant fst on fst.id =fstu.TENANT_ID "
			+ "left join fin_sys_tenant_department fstd on fstd.id = fstu.SYS_DEPT_ID where fstu.IS_DELETE = 0 ";

			private static final String SQL_TENANT_USER =
			"select fstu.*, fst.TENANT_NAME, fst.LV from FIN_SYS_TENANT_USER fstu\n"
			@@ -47,8 +54,8 @@
			* @Date 2023/7/17 14:26
			*/
			@Override
			public GenericPager<FinSysTenantUser> queryAllPageUser(FinSysTenantUserSearchParam param) {
			Map<String, Object> parameter = new HashMap<>(5);
			public PageUtil<FinSysTenantUserVO> queryAllPageUser(FinSysTenantUserSearchParam param) {
			Map<String, Object> parameter = new HashMap<>(10);
			StringBuilder sql = new StringBuilder(SQL_QH_PAGE_USER_PREFIX);
			if (param.getTenantCode() > 0) {
			sql.append(" and fstu.TENANT_CODE =:tenantCode");
			@@ -66,19 +73,11 @@
			sql.append(" and USER_CODE like :USER_CODE");
			parameter.put("USER_CODE", StringUtils.CHAR_PERCENT + param.getUserCode() + StringUtils.CHAR_PERCENT);
			}
			// if(StringUtils.isNotEmpty(param.getUserCode())){
			// sql.append(" and user_code like :user_code");
			// parameter.put("user_code", StringUtils.CHAR_PERCENT + param.getUserCode() + StringUtils.CHAR_PERCENT);
			// }

			if (param.getStatus() != null) {
			sql.append(" and status =:status");
			sql.append(" and fstu.status =:status");
			parameter.put("status", param.getStatus());
			}

			// if(param.getRoleId()!=null &&!param.getRoleId().equals("")){
			// sql.append(" and fstu.SYS_USER_ID in (select user_id from s_role_user where role_id = :role_id)");
			// parameter.put("role_id", param.getRoleId());
			// }

			if (StringUtils.isNotEmpty(param.getUserPhone())) {
			sql.append(" and USER_PHONE =:userPhone");
			@@ -111,8 +110,19 @@
			sql.append(" and fstu.AGENT_JID is null ");
			}
			}
			sql.append(" ORDER BY SEQ asc ,CREATE_TIME desc");
			return this.selectSplit(sql.toString(), parameter, new FinSysTenantUser());
			sql.append(" ORDER BY SEQ asc ,fstu.CREATE_TIME desc");

			GenericPager<Map<String, Object>> mapGenericPager =
			this.selectSplit(sql.toString(), parameter, param.getPageNum(), param.getPageSize(), new MapperUtil());
			PageUtil pageUtil = new PageUtil(mapGenericPager);

			List<FinSysTenantUserVO> result = Lists.newArrayList();
			mapGenericPager.getDatas().forEach(map -> {
			FinSysTenantUserVO finSysTenantUserVO = MapUtils.convertMapToObj(map, FinSysTenantUserVO.class);
			result.add(finSysTenantUserVO);
			});
			pageUtil.setDatas(result);
			return pageUtil;
			}

			@Override
			@@ -218,10 +228,10 @@
			* @return
			*/
			@Override
			public List<S_role> getByUserId(Long userId) {
			public List<S_role> getRoleBySysUserId(Long userId) {
			Map<String, Object> parameter = new HashMap<>();
			StringBuilder sql = new StringBuilder(SQL_SELECT_USER_ID);
			sql.append("and ROLE_ID IN (SELECT DISTINCT(ROLE_ID) FROM S_ROLE_USER WHERE USER_ID= :userId )");
			StringBuilder sql = new StringBuilder("SELECT * FROM S_ROLE where ");
			sql.append("ROLE_ID IN (SELECT DISTINCT(ROLE_ID) FROM S_ROLE_USER WHERE USER_ID= :userId )");
			parameter.put("userId", userId);
			List<S_role> select = this.select(sql.toString(), parameter, new S_role());
			return select;
			@@ -259,4 +269,40 @@
			public List<FinSysTenantUser> getByOrgId(Long orgId) {
			return this.select(SQL_GET_USER, new Object[] {orgId}, new FinSysTenantUser());
			}

			@Override
			public GenericPager<S_role> queryPageRoleList(Long orgId, Integer status, String roleName, Integer dataScope,
			Integer pageNum, Integer pageSize) {
			Map<String, Object> parameters = new HashMap();
			StringBuilder sql = new StringBuilder("select * from s_role where org_id=:orgId");
			parameters.put("orgId", orgId);
			if (status >= 0) {
			sql.append(" and status=:status");
			parameters.put("status", status);
			}

			if (dataScope != null) {
			sql.append(" and data_scope >=:dataScope");
			parameters.put("dataScope", dataScope);
			}

			if (com.walker.infrastructure.utils.StringUtils.isNotEmpty(roleName)) {
			sql.append(" and role_name like :roleName");
			parameters.put("roleName", "%" + roleName + "%");
			}

			return this.selectSplit(sql.toString(), parameters, pageNum, pageSize, new S_role());
			}

			@Override
			public FinSysTenantUser getByTenaniId(String tenantId,String userCode) {
			Map<String, Object> parameter = new HashMap<>();
			StringBuilder sql = new StringBuilder(SQL_SELECT_USER_CODE);
			sql.append(" and TENANT_ID= :tenantId");
			parameter.put("tenantId", tenantId);
			sql.append(" and USER_CODE= :userCode");
			parameter.put("userCode", userCode);
			FinSysTenantUser finSysTenantUser = this.get(sql.toString(), parameter, new FinSysTenantUser());
			return finSysTenantUser;
			}
			}