diff --git a/Cpop-Api/pom.xml b/Cpop-Api/pom.xml index 9acd4c7..0ee3aaf 100644 --- a/Cpop-Api/pom.xml +++ b/Cpop-Api/pom.xml @@ -5,7 +5,7 @@ com.cpop Cpop-Union - 1.1.0 + 1.1.1 ../pom.xml Cpop-Api diff --git a/Cpop-ClockIn-Demo/pom.xml b/Cpop-ClockIn-Demo/pom.xml index 2e0ca35..435d07f 100644 --- a/Cpop-ClockIn-Demo/pom.xml +++ b/Cpop-ClockIn-Demo/pom.xml @@ -4,7 +4,7 @@ com.cpop Cpop-Union - 1.1.0 + 1.1.1 Cpop-ClockIn-Demo diff --git a/Cpop-Core/pom.xml b/Cpop-Core/pom.xml index 3c95c6b..837da6b 100644 --- a/Cpop-Core/pom.xml +++ b/Cpop-Core/pom.xml @@ -5,7 +5,7 @@ com.cpop Cpop-Union - 1.1.0 + 1.1.1 ../pom.xml Cpop-Core diff --git a/Cpop-Generator/pom.xml b/Cpop-Generator/pom.xml index 5b25ab5..7b39335 100644 --- a/Cpop-Generator/pom.xml +++ b/Cpop-Generator/pom.xml @@ -5,7 +5,7 @@ com.cpop Cpop-Union - 1.1.0 + 1.1.1 ../pom.xml Cpop-Generator diff --git a/Cpop-Oam/Cpop-Oam-Web/pom.xml b/Cpop-Oam/Cpop-Oam-Web/pom.xml index e06773d..b747d3c 100644 --- a/Cpop-Oam/Cpop-Oam-Web/pom.xml +++ b/Cpop-Oam/Cpop-Oam-Web/pom.xml @@ -5,7 +5,7 @@ com.cpop Cpop-Union - 1.1.0 + 1.1.1 ../../pom.xml Cpop-Oam-Web diff --git a/Cpop-Oam/pom.xml b/Cpop-Oam/pom.xml index 251df2d..4eb6580 100644 --- a/Cpop-Oam/pom.xml +++ b/Cpop-Oam/pom.xml @@ -5,7 +5,7 @@ com.cpop Cpop-Union - 1.1.0 + 1.1.1 ../pom.xml Cpop-Oam diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictTypeController.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictTypeController.java index 6842f3e..9a9da36 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictTypeController.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictTypeController.java @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -import static com.cpop.system.business.entity.table.DictTypeTableDef.DICT_TYPE; +import static com.cpop.oam.business.entity.table.DictTypeTableDef.DICT_TYPE; /** * 系统-字典类型表 控制层。 diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java index d2a87f4..fd29ad9 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import static com.cpop.system.business.entity.table.DictDataTableDef.DICT_DATA; +import static com.cpop.oam.business.entity.table.DictDataTableDef.DICT_DATA; /** * 系统-字典数据表 服务层实现。 diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java index 948108d..c6a8838 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static com.cpop.system.business.entity.table.DictDataTableDef.DICT_DATA; -import static com.cpop.system.business.entity.table.DictTypeTableDef.DICT_TYPE; +import static com.cpop.oam.business.entity.table.DictDataTableDef.DICT_DATA; +import static com.cpop.oam.business.entity.table.DictTypeTableDef.DICT_TYPE; /** * 系统-字典表 服务层实现。 diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DutyServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DutyServiceImpl.java index 7b9376e..5f6f2ca 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DutyServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DutyServiceImpl.java @@ -149,7 +149,7 @@ public class DutyServiceImpl extends ServiceImpl implements Du Duty one = this.queryChain().where(DUTY.DUTY_DATE.eq(now)).one(); if (one != null) { //获取当天技术值班人员 - StaffDto staff = DbChain.table(USER).select(USER.PHONE_NUMBER, STAFF.NAME).from(USER) + StaffDto staff = DbChain.table(USER).select(USER.PHONE, STAFF.NAME).from(USER) .leftJoin(STAFF).on(STAFF.USER_ID.eq(USER.ID)) .where(STAFF.ID.eq(one.getTechnologyStaffId())).oneAs(StaffDto.class); //技术售后群提醒 diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/LoginServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/LoginServiceImpl.java index 25a2a9a..ed2a998 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/LoginServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/LoginServiceImpl.java @@ -31,9 +31,9 @@ import java.util.stream.Collectors; import static com.cpop.core.base.table.table.UserTableDef.USER; import static com.cpop.oam.business.entity.table.StaffTableDef.STAFF; -import static com.cpop.system.business.entity.table.MenuTableDef.MENU; -import static com.cpop.system.business.entity.table.RoleMenuTableDef.ROLE_MENU; -import static com.cpop.system.business.entity.table.RoleTableDef.ROLE; +import static com.cpop.oam.business.entity.table.MenuTableDef.MENU; +import static com.cpop.oam.business.entity.table.RoleMenuTableDef.ROLE_MENU; +import static com.cpop.oam.business.entity.table.RoleTableDef.ROLE; /** * @author DB diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java index 344abef..8f4e967 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java @@ -23,9 +23,9 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; -import static com.cpop.system.business.entity.table.MenuTableDef.MENU; -import static com.cpop.system.business.entity.table.RoleMenuTableDef.ROLE_MENU; -import static com.cpop.system.business.entity.table.RoleTableDef.ROLE; +import static com.cpop.oam.business.entity.table.MenuTableDef.MENU; +import static com.cpop.oam.business.entity.table.RoleMenuTableDef.ROLE_MENU; +import static com.cpop.oam.business.entity.table.RoleTableDef.ROLE; /** * 系统菜单表 服务层实现。 diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java index 845eeba..f584ad2 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java @@ -27,8 +27,8 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import static com.cpop.system.business.entity.table.RoleMenuTableDef.ROLE_MENU; -import static com.cpop.system.business.entity.table.RoleTableDef.ROLE; +import static com.cpop.oam.business.entity.table.RoleMenuTableDef.ROLE_MENU; +import static com.cpop.oam.business.entity.table.RoleTableDef.ROLE; /** * 系统角色表 服务层实现。 diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/TaskWorkOrderServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/TaskWorkOrderServiceImpl.java index be98d2f..d4c96bd 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/TaskWorkOrderServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/TaskWorkOrderServiceImpl.java @@ -753,7 +753,7 @@ public class TaskWorkOrderServiceImpl extends ServiceImpl staffMap = staffService.listAs(QueryWrapper.create() .select(STAFF.ID, STAFF.NAME) - .select(USER.PHONE_NUMBER.as(StaffInfoVo::getPhoneNumber)) + .select(USER.PHONE.as(StaffInfoVo::getPhoneNumber)) .from(STAFF) .leftJoin(USER) .on(USER.ID.eq(STAFF.USER_ID)) @@ -1003,7 +1003,7 @@ public class TaskWorkOrderServiceImpl extends ServiceImpl staffMap = staffService.listAs(QueryWrapper.create() .select(STAFF.ID, STAFF.NAME) - .select(USER.PHONE_NUMBER.as(StaffInfoVo::getPhoneNumber)) + .select(USER.PHONE.as(StaffInfoVo::getPhoneNumber)) .from(STAFF) .leftJoin(USER) .on(USER.ID.eq(STAFF.USER_ID)) @@ -1079,7 +1079,7 @@ public class TaskWorkOrderServiceImpl extends ServiceImpl staffMap = staffService.listAs(QueryWrapper.create() .select(STAFF.ID, STAFF.NAME) - .select(USER.PHONE_NUMBER.as(StaffInfoVo::getPhoneNumber)) + .select(USER.PHONE.as(StaffInfoVo::getPhoneNumber)) .from(STAFF) .leftJoin(USER) .on(USER.ID.eq(STAFF.USER_ID)) diff --git a/Cpop-Pay/pom.xml b/Cpop-Pay/pom.xml index cea968c..fe9e9a8 100644 --- a/Cpop-Pay/pom.xml +++ b/Cpop-Pay/pom.xml @@ -5,7 +5,7 @@ com.cpop Cpop-Union - 1.1.0 + 1.1.1 ../pom.xml Cpop-Pay diff --git a/Cpop-System/pom.xml b/Cpop-System/pom.xml index 5ba1d8e..58bc3bc 100644 --- a/Cpop-System/pom.xml +++ b/Cpop-System/pom.xml @@ -5,7 +5,7 @@ com.cpop Cpop-Union - 1.1.0 + 1.1.1 ../pom.xml Cpop-System diff --git a/pom.xml b/pom.xml index 3fe9c4d..5721daf 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.cpop Cpop-Union - 1.1.0 + 1.1.1 Cpop-Union 深圳普普数字产业有限公司内部开发框架 pom @@ -33,7 +33,7 @@ 17 - 1.1.0 + 1.1.1 1.8.7 1.10.0 2.0.46