jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 0c185a10d337ba905ef324bfd8e2a64acdb8569a

Authored by jiangjiazhi
2 parents bc29b7bbfe 29a5baafaf
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-biz-service/src/main/resources/mainOrm/Users.xml View file @ 0c185a1
... ... @@ -204,23 +204,23 @@
204 204 <if test="keyword != null and keyword != ''">
205 205 and name like CONCAT(#{keyword}, '%')
206 206 </if>
207   - <if test="ksId != null and ksId != ''">
  207 + <if test="ksId != null">
208 208 and u.ks_id = #{ksId,jdbcType=INTEGER}
209 209 </if>
210   - <if test="orgId != null and orgId != ''">
  210 + <if test="orgId != null">
211 211 and u.org_id = #{orgId,jdbcType=INTEGER}
212 212 </if>
213   - <if test="deptId != null and deptId != ''">
  213 + <if test="deptId != null">
214 214 and u.dept_id = #{deptId,jdbcType=INTEGER}
215 215 </if>
216   - <if test="roleId != null and roleId != ''">
  216 + <if test="roleId != null">
217 217 and ur.role_id = #{roleId,jdbcType=INTEGER}
218 218 </if>
219   - <if test="yn != null and yn != ''">
  219 + <if test="yn != null">
220 220 and u.yn = #{yn,jdbcType=INTEGER}
221 221 and ur.yn = #{yn,jdbcType=INTEGER}
222 222 </if>
223   - <if test="type != null and type != ''">
  223 + <if test="type != null">
224 224 and u.type = #{type,jdbcType=INTEGER}
225 225 </if>
226 226 <include refid="orderAndLimit"/>
platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationLevelEnum.java View file @ 0c185a1
... ... @@ -38,7 +38,7 @@
38 38 this.text = text;
39 39 }
40 40  
41   - public static IdTextModel getById(int id) {
  41 + public static IdTextModel getById(Integer id) {
42 42 for (OrganizationLevelEnum e : OrganizationLevelEnum.values()) {
43 43 if(e.getId().equals(id)) {
44 44 return new IdTextModel(e.getId().toString(), e.getText());
platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationTypeEnum.java View file @ 0c185a1
... ... @@ -37,7 +37,7 @@
37 37 this.text = text;
38 38 }
39 39  
40   - public static IdTextModel getById(int id) {
  40 + public static IdTextModel getById(Integer id) {
41 41 for (OrganizationTypeEnum e : OrganizationTypeEnum.values()) {
42 42 if(e.getId().equals(id)) {
43 43 return new IdTextModel(e.getId().toString(), e.getText());
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java View file @ 0c185a1
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import com.lyms.platform.biz.service.BasicConfigService;
4 4 import com.lyms.platform.common.enums.YnEnums;
  5 +import com.lyms.platform.common.utils.JsonUtil;
5 6 import com.lyms.platform.common.utils.LogUtil;
6 7 import com.lyms.platform.data.service.DataImportTaskService;
7 8 import com.lyms.platform.permission.model.*;
... ... @@ -168,7 +169,7 @@
168 169 o.setCreated(o.getModified());
169 170 organizationService.addOrganization(o);
170 171 }
171   - for (Departments d:organization.getDepartmentsMap().values()) {
  172 + for (Departments d:o.getDepartmentsMap().values()) {
172 173 d.setOrgId(o.getId());
173 174 departmentsQuery.setForeignId(d.getForeignId());
174 175 List<Departments> departmentsList = departmentsService.queryDepartments(departmentsQuery);
... ... @@ -181,7 +182,7 @@
181 182 d.setCreated(d.getModified());
182 183 departmentsService.addDepartments(d);
183 184 }
184   - for (Users u:departments.getUsersMap().values()) {
  185 + for (Users u:d.getUsersMap().values()) {
185 186 u.setOrgId(o.getId());
186 187 u.setDeptId(d.getId());
187 188 u.setKsId(d.getId());