优化系统配置模块
This commit is contained in:
@@ -86,9 +86,13 @@ public class SystemConfigService {
|
||||
SystemConfig systemConfig = JSONObject.parseObject(beanJson, SystemConfig.class);
|
||||
int result=0;
|
||||
try{
|
||||
result=systemConfigMapper.insertSelective(systemConfig);
|
||||
logService.insertLog("系统配置",
|
||||
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(systemConfig.getCompanyName()).toString(), request);
|
||||
if(userService.checkIsTestUser()) {
|
||||
result=-1;
|
||||
} else {
|
||||
result=systemConfigMapper.insertSelective(systemConfig);
|
||||
logService.insertLog("系统配置",
|
||||
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(systemConfig.getCompanyName()).toString(), request);
|
||||
}
|
||||
}catch(Exception e){
|
||||
JshException.writeFail(logger, e);
|
||||
}
|
||||
@@ -101,9 +105,13 @@ public class SystemConfigService {
|
||||
systemConfig.setId(id);
|
||||
int result=0;
|
||||
try{
|
||||
result=systemConfigMapper.updateByPrimaryKeySelective(systemConfig);
|
||||
logService.insertLog("系统配置",
|
||||
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(systemConfig.getCompanyName()).toString(), request);
|
||||
if(userService.checkIsTestUser()) {
|
||||
result=-1;
|
||||
} else {
|
||||
result = systemConfigMapper.updateByPrimaryKeySelective(systemConfig);
|
||||
logService.insertLog("系统配置",
|
||||
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(systemConfig.getCompanyName()).toString(), request);
|
||||
}
|
||||
}catch(Exception e){
|
||||
JshException.writeFail(logger, e);
|
||||
}
|
||||
|
||||
@@ -23,6 +23,7 @@ import com.jsh.erp.utils.StringUtil;
|
||||
import com.jsh.erp.utils.Tools;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
@@ -39,6 +40,12 @@ import java.util.Objects;
|
||||
@Service
|
||||
public class UserService {
|
||||
private Logger logger = LoggerFactory.getLogger(UserService.class);
|
||||
|
||||
private static final String TEST_USER = "jsh";
|
||||
|
||||
@Value("${demonstrate.open}")
|
||||
private boolean demonstrateOpen;
|
||||
|
||||
@Resource
|
||||
private UserMapper userMapper;
|
||||
|
||||
@@ -55,7 +62,6 @@ public class UserService {
|
||||
@Resource
|
||||
private UserBusinessService userBusinessService;
|
||||
|
||||
|
||||
public User getUser(long id)throws Exception {
|
||||
User result=null;
|
||||
try{
|
||||
@@ -314,6 +320,25 @@ public class UserService {
|
||||
return (User)request.getSession().getAttribute("user");
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查当前用户是否是演示用户
|
||||
* @return
|
||||
*/
|
||||
public Boolean checkIsTestUser() throws Exception{
|
||||
Boolean result = false;
|
||||
try {
|
||||
if (demonstrateOpen) {
|
||||
User user = getCurrentUser();
|
||||
if (TEST_USER.equals(user.getLoginName())) {
|
||||
result = true;
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
JshException.readFail(logger, e);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据用户名查询id
|
||||
* @param loginName
|
||||
|
||||
Reference in New Issue
Block a user