Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/ConfigRuleEnterpriseServiceImpl.java

@@ -37,7 +37,7 @@ public class ConfigRuleEnterpriseServiceImpl implements ConfigRuleEnterpriseServ
     public Integer save(RuleEnterpriseDTO dto) {
         dto.setCreateTime(new Date());
         dto.setUpdateTime(new Date());
-        dto.setStatus(1);
+        dto.setDeleteFlag(0);
         TabConfigRuleEnterprise record = EntityUtil.changeEntityNew(TabConfigRuleEnterprise.class, dto);
         tabConfigRuleEnterpriseMapper.insert(record);
         return record.getEnterpriseRuleId();

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/ConfigRuleEnterpriseApiServiceImpl.java

@@ -185,7 +185,7 @@ public class ConfigRuleEnterpriseApiServiceImpl implements ConfigRuleEnterpriseA
         if (defaultRule != null && defaultRule.getEnterpriseRuleId().intValue() == enterpriseRuleId) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "平台默认规则不允许删除");
         }
-        configRuleEnterpriseService.update(record.setDeleteFlag(0));
+        configRuleEnterpriseService.update(record.setDeleteFlag(1));
         //解绑
         configRuleEnterpriseService.deleteByEnterpriseRuleId(enterpriseRuleId);
         configRuleEnterpriseService.deleteByEnterpriseRuleIdForRuleRel(enterpriseRuleId);

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/AuditLogController.java

@@ -14,6 +14,7 @@ import com.gic.enterprise.qo.AuditLogQO;
 import com.gic.enterprise.service.AuditLogApiService;
 import com.gic.enterprise.service.ProjectItemApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
+import com.gic.enterprise.utils.UserDetail;
 import com.gic.enterprise.utils.UserDetailUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,20 +45,30 @@ public class AuditLogController {
         auditLogDTO.setAuditLogId(auditLogQO.getAuditLogId());
         auditLogDTO.setAuditResult(auditLogQO.getAuditResult());
         auditLogDTO.setAuditReason(auditLogQO.getAuditReason());
-        ServiceResponse<AuditorDTO> auditorServiceResponse;
+        UserDetail userDetail = UserDetailUtils.getUserDetail();
+        AuditorDTO auditorDTO;
         if (StringUtils.isNotBlank(auditLogQO.getOpenid())) {
-            auditorServiceResponse = auditorApiService.getAuditorByOpenid(auditLogQO.getOpenid());
-        } else if (UserDetailUtils.getUserDetail() != null) {
-            auditorServiceResponse = auditorApiService.getAuditorByUserId(UserDetailUtils.getUserDetail().getEnterpriseId(), UserDetailUtils.getUserDetail().getUserId());
-        }else {
+            ServiceResponse<AuditorDTO> auditorServiceResponse = auditorApiService.getAuditorByOpenid(auditLogQO.getOpenid());
+            if (!auditorServiceResponse.isSuccess()) {
+                return ResultControllerUtils.commonResult(auditorServiceResponse);
+            }
+            auditorDTO = auditorServiceResponse.getResult();
+        } else if (userDetail != null) {
+            if (userDetail.getUserInfo().getSuperAdmin() == 0) {
+                ServiceResponse<AuditorDTO> auditorServiceResponse = auditorApiService.getAuditorByUserId(userDetail.getEnterpriseId(), userDetail.getUserId());
+                if (!auditorServiceResponse.isSuccess()) {
+                    return ResultControllerUtils.commonResult(auditorServiceResponse);
+                }
+                auditorDTO = auditorServiceResponse.getResult();
+            } else {
+                auditorDTO = new AuditorDTO();
+                auditorDTO.setAuditorId(null);
+                auditLogDTO.setAuditorName(userDetail.getUserInfo().getUserName());
+                auditLogDTO.setAuditorPhone(userDetail.getUserInfo().getPhoneNumber());
+            }
+        } else {
             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数错误");
         }
-        if (!auditorServiceResponse.isSuccess()) {
-            return ResultControllerUtils.commonResult(auditorServiceResponse);
-        }
-        auditLogDTO.setAuditorId(auditorServiceResponse.getResult().getAuditorId());
-        auditLogDTO.setAuditorName(auditorServiceResponse.getResult().getAuditorName());
-        auditLogDTO.setAuditorPhone(auditorServiceResponse.getResult().getPhone());
         ServiceResponse<AuditLogDTO> serviceResponse = auditLogApiService.audit(auditLogDTO);
         if (serviceResponse.isSuccess()) {
             createLog(auditLogDTO);