瀏覽代碼

增加版本号

tudc 3 年之前
父節點
當前提交
a5571b1264
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      flowable/src/main/java/com/huyi/flowable/controller/ApiController.java

+ 3 - 1
flowable/src/main/java/com/huyi/flowable/controller/ApiController.java

@@ -104,7 +104,7 @@ public class ApiController {
         UserEntityImpl user = new UserEntityImpl();
         UserEntityImpl user = new UserEntityImpl();
 
 
         // 查询是否新用户
         // 查询是否新用户
-        User dataUser = identityService.createUserQuery().userId(id).singleResult();
+        UserEntityImpl dataUser = (UserEntityImpl)(identityService.createUserQuery().userId(id).singleResult());
         if (dataUser == null) {
         if (dataUser == null) {
             user.setRevision(0);
             user.setRevision(0);
             user.setId(id);
             user.setId(id);
@@ -113,6 +113,7 @@ public class ApiController {
             // 新增用户
             // 新增用户
             identityService.saveUser(user);
             identityService.saveUser(user);
         } else if (!dataUser.getDisplayName().equals(name)) {
         } else if (!dataUser.getDisplayName().equals(name)) {
+            user.setRevision(dataUser.getRevision());
             user.setId(id);
             user.setId(id);
             user.setDisplayName(name);
             user.setDisplayName(name);
             user.setPassword("123");
             user.setPassword("123");
@@ -143,6 +144,7 @@ public class ApiController {
     @Log
     @Log
     @RequestMapping(value = "addGroup")
     @RequestMapping(value = "addGroup")
     @ResponseBody
     @ResponseBody
+    @Transactional(rollbackFor=Exception.class)
     public BaseResult addGroup (@RequestParam("groupId") String groupId, @RequestParam("groupName") String groupName){
     public BaseResult addGroup (@RequestParam("groupId") String groupId, @RequestParam("groupName") String groupName){
         GroupEntityImpl groupEntity = new GroupEntityImpl();
         GroupEntityImpl groupEntity = new GroupEntityImpl();
         BaseResult baseResult = new BaseResult();
         BaseResult baseResult = new BaseResult();