Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PersonnelBusinessMapper.java

@@ -21,14 +21,14 @@ import java.util.Map;
 public interface PersonnelBusinessMapper extends BaseMapper<PersonnelBusiness> {
     IPage<CompanyDtoUserDto> getCompanyDtoUserDtopage(@Param("dto") CompanyDtoUserDto dto);
 
-    Map<String,String> getorgcode(@Param("id")Long id);
+    Map<String, String> getorgcode(@Param("id") Long id);
 
     //根据平台userid  获取人员所属经销商
-    UserUnitInformationDto getUserUnitInformationDto(@Param("userId")String userId);
+    UserUnitInformationDto getUserUnitInformationDto(@Param("userId") String userId);
 
 
     //根据平台userid  获取运维人员信息
-    UserUnitInformationDto getMaintenanceUserUnitInformationDto(@Param("userId")String userId);
+    UserUnitInformationDto getMaintenanceUserUnitInformationDto(@Param("userId") String userId);
 
 
     String selectUserInfo(Long sequenceNbr);
@@ -37,6 +37,8 @@ public interface PersonnelBusinessMapper extends BaseMapper<PersonnelBusiness> {
 
     void deletePguByUserId(String userId);
 
+    void deleteRoleByUserId(@Param("userId") String userId, @Param("roleId") Long roleId);
+
     void deleteSubByUserId(String userId);
 
     void deleteHpbByFoundationId(Long sequenceNbr);
@@ -47,5 +49,7 @@ public interface PersonnelBusinessMapper extends BaseMapper<PersonnelBusiness> {
 
     List<String> selectHygfTableName();
 
-    int countByUserId(@Param("tableName") String tableName, @Param("userId")String userId);
+    int countByUserId(@Param("tableName") String tableName, @Param("userId") String userId);
+
+    void deleteOrgRoleByUserId(@Param("userId") String userId, @Param("roleId") Long roleId);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PersonnelBusinessMapper.xml

@@ -132,6 +132,14 @@ select  ORG_CODE orgCode from  privilege_company  where privilege_company.SEQUEN
         DELETE FROM privilege_group_user WHERE USER_ID=#{userId}
     </select>
 
+    <delete id="deleteRoleByUserId">
+        DELETE FROM privilege_group_user WHERE USER_ID=#{userId} AND GROUP_SEQ = #{roleId}
+    </delete>
+
+    <delete id="deleteOrgRoleByUserId">
+        DELETE FROM privilege_user_org_role WHERE USER_ID=#{userId} AND ROLE_SEQ = #{roleId}
+    </delete>
+
      <select id="deleteSubByUserId">
         DELETE FROM std_user_biz WHERE amos_user_id=#{userId}
      </select>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHYGFInverterDayGenerateMapper.xml

@@ -78,7 +78,7 @@
                 and  created_time >= #{startTime}
             </if>
             <if test="endTime != null">
-                and  created_time created_time &lt;= #{endTime}
+                and  created_time &lt;= #{endTime}
             </if>
         </where>
         order by created_time desc

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java

@@ -25,6 +25,7 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.GroupUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -342,11 +343,13 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
             LambdaQueryWrapper<PublicAgencyUser> qud = new LambdaQueryWrapper<>();
             qud.eq(PublicAgencyUser::getSequenceNbr, id);
             PublicAgencyUser publicAgencyUse = publicAgencyUserMapper.selectOne(qud);
+
             LambdaQueryWrapper<PersonnelBusiness> qug = new LambdaQueryWrapper<>();
             qug.eq(PersonnelBusiness::getFoundationId, publicAgencyUse.getSequenceNbr());
             PersonnelBusiness personnelBusines = personnelBusinessMapper.selectOne(qug);
             personnelBusines.setUserType("2");
             personnelBusinessMapper.updateById(personnelBusines);
+
             //获取经销商管理员
             LambdaQueryWrapper<UnitInfo> qudg = new LambdaQueryWrapper<>();
             qudg.eq(UnitInfo::getAmosCompanySeq, personnelBusines.getAmosDealerId());
@@ -355,17 +358,19 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
             LambdaQueryWrapper<PublicAgencyUser> qudx = new LambdaQueryWrapper<>();
             qudx.eq(PublicAgencyUser::getAmosUserId, unitInfo.getAdminUserId());
             PublicAgencyUser publicAgencyUsex = publicAgencyUserMapper.selectOne(qudx);
+
             LambdaQueryWrapper<PersonnelBusiness> qugf = new LambdaQueryWrapper<>();
             qugf.eq(PersonnelBusiness::getFoundationId, publicAgencyUsex.getSequenceNbr());
             PersonnelBusiness personnelBusinesx = personnelBusinessMapper.selectOne(qugf);
             personnelBusinesx.setUserType("1");
-
             personnelBusinessMapper.updateById(personnelBusinesx);
+
             unitInfo.setAdminLoginName(publicAgencyUse.getAmosUserName());
             unitInfo.setAdminPhone(publicAgencyUse.getEmergencyTelephone());
             unitInfo.setAdminUserId(publicAgencyUse.getAmosUserId());
             unitInfo.setAdminUserName(publicAgencyUse.getRealName());
             unitInfoMapper.updateById(unitInfo);
+
             //修改管理员
             List<Long> roidx = JSONArray.parseArray(publicAgencyUsex.getRole(), Long.class);
 
@@ -410,7 +415,10 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
             roid.add(userGroupId);
             if (roid.contains(userGroupempty)) {
                 roid.remove(userGroupempty);
-                Privilege.groupUserClient.deleteGroupUser(userGroupempty, publicAgencyUsex.getAmosUserId());
+               // Privilege.groupUserClient.deleteGroupUser(userGroupempty, publicAgencyUsex.getAmosUserId());
+                 personnelBusinessMapper.deleteRoleByUserId(publicAgencyUse.getAmosUserId(),userGroupempty);
+                personnelBusinessMapper.deleteOrgRoleByUserId(publicAgencyUse.getAmosUserId(),userGroupempty);
+
             }
             publicAgencyUse.setRole(JSON.toJSONString(roid));
 

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

@@ -122,9 +122,9 @@
                 AND a.QRCODE_COLOR = #{qrCodeColor}
             </if>
             <if test="ne != null and ne != ''">
+                AND a.QRCODE_COLOR != #{ne}
             </if>
         </where>
-        AND a.QRCODE_COLOR != #{ne}
         ORDER BY  sort asc, a.UPDATE_STAMP DESC
         limit #{current},#{size}
     </select>