lsd/ks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改企业审核保存

Browse Source 
2.baseEntity返回update_time
This commit is contained in:
sh
2025-10-14 18:57:33 +08:00
parent 1181ef0b1c
commit fcb421f97d
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@@ -6,7 +6,6 @@ import javax.servlet.http.HttpServletResponse;
import com.ruoyi.cms.domain.Company;
import com.ruoyi.cms.service.ICompanyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -268,13 +267,19 @@ public class SysUserController extends BaseController
{
Company company1 = companyService.approval(company);
SysUser sysUser = new SysUser();
sysUser.setUserName(company1.getContactPersonPhone());
sysUser.setNickName(company1.getContactPerson());
sysUser.setPhonenumber(company1.getContactPersonPhone());
sysUser.setDeptId(101L);
String contactPersonPhone = company1.getContactPersonPhone();
String lastSixDigits = contactPersonPhone.substring(contactPersonPhone.length() - 6);
sysUser.setPassword(lastSixDigits);
if(StringUtils.isNotEmpty(contactPersonPhone)){
String lastSixDigits = contactPersonPhone.substring(contactPersonPhone.length() - 6);
sysUser.setPassword(lastSixDigits);
sysUser.setUserName(company1.getContactPersonPhone());
sysUser.setPhonenumber(company1.getContactPersonPhone());
sysUser.setNickName(company1.getContactPersonPhone());
}else{
sysUser.setUserName(company1.getName());
sysUser.setNickName(company1.getName());
}
sysUser.setPhonenumber(getUsername());
Long[] postIds = {1L};
Long[] roleIds = {100L};

6
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java
View File

@@ -284,8 +284,10 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper,Company> imple
if(company1==null){
throw new ServiceException("企业不存在");
}
if(company1.getStatus()!=0){
throw new ServiceException("企业已审核");
if(company1.getStatus()!=null){
if(company1.getStatus()!=0){
throw new ServiceException("企业已审核");
}
}
companyMapper.updateById(company);
//创建账号

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
View File

@@ -50,7 +50,7 @@ public class BaseEntity implements Serializable
/** 更新时间 */
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonIgnore
// @JsonIgnore
@ApiModelProperty(hidden = true)
private String updateTime;