Skip to content

Fix/admin bulk registration role issue #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vishwab1 merged 3 commits into from
Aug 5, 2026
Merged

Fix/admin bulk registration role issue #144

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccf6807
fix update user issue and role issue
SauravBizbRolly Aug 5, 2026
4e5eebd
fix update user issue and role issue
SauravBizbRolly Aug 5, 2026
e63cb80
Merge branch 'release-3.8.2' into fix/admin_bulk_registration_role_issue
SauravBizbRolly Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/com/iemr/admin/repo/employeemaster/EmployeeMasterRepoo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ M_User1 checkingEmpDetails(@Param("userName") String userName, @Param("aadhaarNo

List<M_User1> findByUserIDIn(List<Integer> userIDs);

M_User1 findEmployeeByContactForUpdate(String contactNo, Integer userID);
@Query("SELECT u FROM M_User1 u WHERE u.contactNo=:contactNo AND u.userID<>:userID AND deleted=false")
M_User1 findEmployeeByContactForUpdate(@Param("contactNo") String contactNo, @Param("userID") Integer userID);

M_User1 findEmployeeAadhaarNoForUpdate(String aadhaarNo, Integer userID);
@Query("SELECT u FROM M_User1 u WHERE u.aadhaarNo=:aadhaar AND u.userID<>:userID AND deleted=false")
M_User1 findEmployeeAadhaarNoForUpdate(@Param("aadhaar") String aadhaar, @Param("userID") Integer userID);
}
Loading